From 999b99de9415a3d55f6f46dcb99d74ed3d476982 Mon Sep 17 00:00:00 2001

From: =?UTF-8?q?Ond=C5=99ej=20Lyson=C4=9Bk?= <olysonek@redhat.com>

Date: Wed, 27 Mar 2019 15:11:05 +0100

Subject: [PATCH] Fix stale links and outdated info

MIME-Version: 1.0

Content-Type: text/plain; charset=UTF-8

Content-Transfer-Encoding: 8bit

This combines several upstream commits, see below. The change to

sensors.conf.default is downstream-only.

Resolves: rhbz#1356253

Signed-off-by: Ondřej Lysoněk <olysonek@redhat.com>

(cherry picked from commit 75dbc240d9d758a75ff04f6b6bfa3f34e8842087)

(cherry picked from commit 4bc6ae4b8fdb7db96aa65537225922ec0dd1b284)

(cherry picked from commit e0e2d2d787d8d86fad1d3c545fbf487605903bd6)

(cherry picked from commit 24dab30d23cd99098b487585b54e30b8c4e899cf)

(cherry picked from commit 6413b80847ec54792d026191c01cdb985441a28b)

(cherry picked from commit be3679ae06b622b1d868271ddeb6ae8d12196d1f)

(cherry picked from commit 17d62bd3180d01676834d8a901d9bb1216b2f979)

(cherry picked from commit 8f54fe85e8c9015190a2c80b8297ea69b5111728)

(cherry picked from commit 807f9b1529892c0ac89bca0c7ae781c59f9c8393)

(cherry picked from commit 255804953e039a725df47c596e47f68554118ca5)

(cherry picked from commit 012d76b9785b467cf219bf134d6610861de58a97)

(cherry picked from commit 84f773b3ec8b75f377a68fd1436ea3ac6d11b170)

---

 Makefile                         |  2 +-

 README                           | 27 ++++++++++++++++++---------

 doc/developers/lm_sensors.lsm    | 10 ++++------

 doc/developers/release_checklist | 30 ++++++++----------------------

 doc/donations                    |  2 +-

 doc/git                          | 22 ++++++++++++++++++++++

 doc/progs                        |  7 +++++--

 doc/svn                          | 31 -------------------------------

 etc/sensors.conf.default         |  2 +-

 etc/sensors.conf.eg              |  4 ++--

 lib/libsensors.3                 |  3 +--

 lib/sensors.conf.5               |  5 +----

 prog/detect/sensors-detect       |  6 +++---

 prog/dump/isadump.8              |  2 +-

 prog/dump/isaset.8               |  2 +-

 prog/init/lm_sensors.init        |  2 +-

 prog/rrd/sens_day.in             |  2 +-

 prog/rrd/sens_week.in            |  2 +-

 prog/rrd/summ_week.in            |  2 +-

 prog/sensord/rrd.c               |  3 ++-

 prog/sensors/sensors.1           |  2 +-

 prog/tellerstats/index.shtml     |  2 +-

 22 files changed, 77 insertions(+), 93 deletions(-)

 create mode 100644 doc/git

 delete mode 100644 doc/svn

diff --git a/Makefile b/Makefile

index d6f2192c..2f5859f0 100644

--- a/Makefile

+++ b/Makefile

@@ -226,7 +226,7 @@ manhtml:

 	cp $(MANPAGES) html

 	cd html ; \

 	export LOGNAME=sensors ; \

-	export HOSTNAME=www.lm-sensors.org ; \

+	export HOSTNAME=hwmon.wiki.kernel.org ; \

 	man2html *.[1-8] ; \

 	$(RM) *.[1-8]

diff --git a/README b/README

index 9c09ae4a..87b324b4 100644

--- a/README

+++ b/README

@@ -82,23 +82,32 @@ daemon watching for sensor values, logging alarms and feeding an RRD

 database with the sensor measurements.

 This package does not contain a nice graphical monitor. See

-http://www.lm-sensors.org/wiki/UsefulLinks for pointers to such programs.

+http://sensors-applet.sourceforge.net/

+https://01.org/powertop/

+https://wpitchoune.net/psensor/

+https://amanusk.github.io/s-tui/

+for such programs.

 OTHER INFORMATION

 -----------------

-The developers of this package can be reached through a mailing-list

-(see http://www.lm-sensors.org/wiki/AuthorsAndContributors). Do not hesitate

-to mail us if you have questions, suggestions, problems, want to

-contribute, or just want to report it works for you. But please try to

+The lm_sensors website can be found at

+https://hwmon.wiki.kernel.org/lm_sensors

+

+The developers of this package can be reached using

+* a mailing list lm-sensors <at> vger <dot> kernel <dot> org

+  (you can get information on how to subscribe, unsubscribe, and the list

+  of archives at http://vger.kernel.org/vger-lists.html#lm-sensors;

+  you do not need to be subscribed to post to the list)

+* GitHub (see https://github.com/lm-sensors/lm-sensors)

+

+Do not hesitate to contact us if you have questions, suggestions, problems,

+want to contribute, or just want to report it works for you. But please try to

 read the documentation before you ask any questions! It's all under doc/.

-Also make sure you read the FAQ at http://www.lm-sensors.org/wiki/FAQ.

 The latest version of this package can always be found at:

-http://www.lm-sensors.org/wiki/Download. Pre-release versions can be

-retrieved through anonymous SVN; see doc/svn for details.

-

+https://github.com/lm-sensors/lm-sensors.

 LICENSE

 -------

diff --git a/doc/developers/lm_sensors.lsm b/doc/developers/lm_sensors.lsm

index dcccd623..cf239557 100644

--- a/doc/developers/lm_sensors.lsm

+++ b/doc/developers/lm_sensors.lsm

@@ -6,13 +6,11 @@ Description: Hardware health monitoring package for Linux. It consists of

              a library to allow applications to read sensors data more

              easily, and of an example program to pretty print this data.

              Also included is a fan speed control script.

-             http://www.lm-sensors.org/

+             https://hwmon.wiki.kernel.org/lm_sensors

 Keywords: sensors health hardware-monitoring fan-speed

 Author: jdelvare@suse.de (Jean Delvare)

-Maintained-by: jdelvare@suse.de (Jean Delvare)

-Primary-site: http://dl.lm-sensors.org /lm-sensors/releases/

-              lm_sensors-3.4.0.tar.bz2

-              lm_sensors-3.4.0.tar.bz2.sig

-Alternate-site: ftp.netroedge.com /pub/lm-sensors/

+Maintained-by: olysonek@redhat.com (Ondřej Lysoněk)

+Primary-site: https://github.com

+              /lm-sensors/lm-sensors/archive/V3-4-0/lm-sensors-3-4-0.tar.gz

 Copying-policy: GPL/LGPL

 End

diff --git a/doc/developers/release_checklist b/doc/developers/release_checklist

index 9ea1ddf2..b84256b5 100644

--- a/doc/developers/release_checklist

+++ b/doc/developers/release_checklist

@@ -12,30 +12,16 @@ Release steps:

 - Update doc/libsensors-API.txt and SENSORS_API_VERSION in lib/sensors.h

 - Update version.h

 - Commit

-- Tag the release using SVN:

-  svn copy http://lm-sensors.org/svn/lm-sensors/trunk http://lm-sensors.org/svn/lm-sensors/tags/V3-x-x -m "3.x.x release"

-

-- Move to a temporary directory and get a copy of the freshly tagged code:

-  svn export http://lm-sensors.org/svn/lm-sensors/tags/V3-x-x lm_sensors-3.x.x

-- Tar it up:

-  tar -jcf lm_sensors-3.x.x.tar.bz2 lm_sensors-3.x.x

-- Sign it:

-  gpg -b lm_sensors-3.x.x.tar.bz2

-- Post it:

-  scp lm_sensors-3.x.x.tar.bz2{,.sig} devel.atrpms.net:/srv/lm-sensors.org/dl/lm-sensors/releases

-- Set correct permissions:

-  ssh devel.atrpms.net chmod 664 '/srv/lm-sensors.org/dl/lm-sensors/releases/lm_sensors-3.x.x.tar.bz2{,.sig}'

+- Tag the release using git:

+  git tag V3-x-x

+  git push origin V3-x-x

 After release, remember to:

-- Update the Download page on lm-sensors.org, then add a news item

+- Update the Download page on https://hwmon.wiki.kernel.org/download - use

+  a URL in the following format:

+  https://github.com/lm-sensors/lm-sensors/archive/V3-x-x/lm-sensors-3-x-x.tar.gz

+- Add a news item to https://hwmon.wiki.kernel.org/lm_sensors

 - Announce on the lm-sensors mailing list

-- Add "+SVN" to version.h and commit

-- Mark the corresponding release milestone as complete using trac-admin

-  e.g. 'trac-admin /srv/lm-sensors.org/trac milestone completed 3.x.x now'

-- Create a new version for the bug tracking system using trac-admin

-  e.g. 'trac-admin /srv/lm-sensors.org/trac version add 3.x.x now'

-- Create a new release milestone using trac-admin

-  e.g. 'trac-admin /srv/lm-sensors.org/trac milestone add 3.x.x+1 2012-05-10'

+- Add "+git" to version.h and commit

 - Send lm_sensors.lsm to the LSM by mailing it to lsm@qqx.org with the

   subject `add' (no quotes)

-- Copy to mirrors

diff --git a/doc/donations b/doc/donations

index 92eea578..4a30c2d0 100644

--- a/doc/donations

+++ b/doc/donations

@@ -12,7 +12,7 @@ so hardware which isn't directly related to the development of a hardware

 monitoring driver, but can be used to build test systems, is welcome too.

 If you would like to make a donation, please contact us. See

-http://www.lm-sensors.org/wiki/AuthorsAndContributors. Thanks!

+https://hwmon.wiki.kernel.org/authorsandcontributors. Thanks!

 Donations are listed in chronological order. Note that the person mentioned

diff --git a/doc/git b/doc/git

new file mode 100644

index 00000000..beeaedd8

--- /dev/null

+++ b/doc/git

@@ -0,0 +1,22 @@

+Git Repository 

+

+Anonymous access to our git repository is available. This means

+that users can have direct access to up-to-the-minute code.

+

+Driver development for kernel version 3 is taking place directly in the kernel

+using git. The git repository is only used for user-space tools.

+

+We presume that you have git installed on your machine. To check out a

+working copy of the code for this project use the following command:

+

+git clone https://github.com/lm-sensors/lm-sensors.git

+

+To update the code, do a git pull from within the lm-sensors directory.

+Please read the README and INSTALL files of your working copy for how

+to build the code. Also read the related files in the 'doc' directory

+for info regarding the different bus and chip drivers. Lastly, you can use

+the regular git commands on the files (like git log [filename]) to see the

+comments made by the developers as changes were made.

+

+If you're not familiar with the use of we recommend the excellent

+online git documentation at https://git-scm.com/doc.

diff --git a/doc/progs b/doc/progs

index 080f461f..0c5464df 100644

--- a/doc/progs

+++ b/doc/progs

@@ -6,8 +6,11 @@ These programs are generally small utilities used for debugging,

 and installation of the lm_sensors package, and for demonstrating

 the use of the drivers and libraries in this package.

 For more elaborate programs (for example, GUI sensor displays),

-see http://www.lm-sensors.org/wiki/UsefulLinks.

-

+see https://github.com/lm-sensors/lm-sensors/

+    http://sensors-applet.sourceforge.net/

+    https://01.org/powertop/

+    https://wpitchoune.net/psensor/

+    https://amanusk.github.io/s-tui/

 * prog/daemon/healthd.sh (written in bash, not installed)

   An example of a very simple hardware health monitoring daemon.

diff --git a/doc/svn b/doc/svn

deleted file mode 100644

index 2f0b1a84..00000000

--- a/doc/svn

+++ /dev/null

@@ -1,31 +0,0 @@

-Subversion Repository 

-

-Anonymous access to our Subversion repository (SVN) is available. This means

-that users can have direct access to up-to-the-minute code.

-(http://subversion.tigris.org/)

-

-Driver development for kernel version 3 is taking place directly in the kernel

-using GIT. Do not use the drivers from our SVN repository for kernel version

-2.6 or 3, it will not work. The user-space tools will work though.

-

-We presume that you have Subversion installed on your machine. To check out a

-working copy of the code for this project use the following commands:

-

-svn checkout http://lm-sensors.org/svn/i2c/trunk i2c

-svn checkout http://lm-sensors.org/svn/lm-sensors/trunk lm-sensors

-

-To update the code, do a svn update from within the i2c or lm-sensors

-directories. Please read the README and INSTALL files of your working copy

-for how to build the code. Also read the related files in the 'doc' directory

-for info regarding the different bus and chip drivers. Lastly, you can use

-the regular svn commands on the files (like svn log [filename]) to see the

-comments made by the developers as changes were made.

-

-If you're not familiar with the use of Subversion we recommend the excellent

-Subversion book which is a valuable resource.

-(http://svnbook.red-bean.com/)

-

-Commits to the repositories are notified on the lm-sensors-notify

-mailing-list. Feel free to subscribe if you want to be informed of the

-changes made to the i2c and lm-sensors repositories. 

-(http://lists.lm-sensors.org/mailman/listinfo/lm-sensors-notify)

diff --git a/etc/sensors.conf.default b/etc/sensors.conf.default

index 0365c6e5..f007e61a 100644

--- a/etc/sensors.conf.default

+++ b/etc/sensors.conf.default

@@ -10,7 +10,7 @@

 # approach makes further updates much easier.

 #

 # Such custom configuration files for specific mainboards can be found at

-# http://www.lm-sensors.org/wiki/Configurations

+# https://github.com/lm-sensors/lm-sensors/tree/master/configs

 chip "lm78-*" "lm79-*" "lm80-*" "lm96080-*"

diff --git a/etc/sensors.conf.eg b/etc/sensors.conf.eg

index 309aad6d..d8f1dfdc 100644

--- a/etc/sensors.conf.eg

+++ b/etc/sensors.conf.eg

@@ -2000,7 +2000,7 @@ chip "f71805f-*" "f71872f-*"

 # The configuration below is for the Kv8Pro and AV8 this is the default as this

 # driver is developed and tested on a Kv8Pro.

 # Configurations for many other Abit boards can be found at:

-# http://www.lm-sensors.org/trac/wiki/Configurations/Abit

+# https://github.com/lm-sensors/lm-sensors/tree/master/configs/Abit

 # If your motherboard isn't listed there and you create a configuration for it

 # please add it there.

@@ -2108,7 +2108,7 @@ chip "dme1737-*"

 # driver is developed and tested on an Epox EP-9U1697 GLI board.

 #

 # Premade configurations for other boards can be found at:

-# http://www.lm-sensors.org/trac/wiki/Configurations/

+# https://github.com/lm-sensors/lm-sensors/tree/master/configs

 # If your motherboard isn't listed there and you create a configuration for it

 # please add it there.

 #

diff --git a/lib/libsensors.3 b/lib/libsensors.3

index 399e90f4..23059bea 100644

--- a/lib/libsensors.3

+++ b/lib/libsensors.3

@@ -274,5 +274,4 @@ sensors.conf(5)

 .SH AUTHOR

 Frodo Looijaard, Jean Delvare and others

-http://www.lm-sensors.org/

-

+https://hwmon.wiki.kernel.org/lm_sensors

diff --git a/lib/sensors.conf.5 b/lib/sensors.conf.5

index dbf1ba21..fa0414b0 100644

--- a/lib/sensors.conf.5

+++ b/lib/sensors.conf.5

@@ -566,7 +566,4 @@ libsensors(3)

 .SH AUTHOR

 Frodo Looijaard and the lm_sensors group

-http://www.lm-sensors.org/

-

-

-

+https://hwmon.wiki.kernel.org/lm_sensors

diff --git a/prog/detect/sensors-detect b/prog/detect/sensors-detect

index fb6658c0..279caf80 100755

--- a/prog/detect/sensors-detect

+++ b/prog/detect/sensors-detect

@@ -7004,7 +7004,7 @@ sub generate_modprobes

 		next if not @{$chips_detected{$driver}};

 		if ($driver eq "to-be-written") {

 			print "Note: there is no driver for ${$chips_detected{$driver}}[0]{chipname} yet.\n".

-			      "Check http://www.lm-sensors.org/wiki/Devices for updates.\n\n";

+			      "Check https://hwmon.wiki.kernel.org/device_support_status for updates.\n\n";

 		} elsif (!is_module_builtin($driver)) {

 			open(local *INPUTFILE, "modprobe -l $driver 2>/dev/null |");

 			local $_;

@@ -7020,7 +7020,7 @@ sub generate_modprobes

 			# isn't supported

 			if ((($? >> 8) == 0) && ! $modulefound) {

 				print "Warning: the required module $driver is not currently installed\n".

-				      "on your system. Check http://www.lm-sensors.org/wiki/Devices for\n".

+				      "on your system. Check https://hwmon.wiki.kernel.org/device_support_status for\n".

 				      "driver availability.\n\n";

 			} else {

 				$hwmon_modules{$driver}++

@@ -7312,7 +7312,7 @@ sub main

 			print "Either your system has no sensors, or they are not supported, or\n".

 			      "they are connected to an I2C or SMBus adapter that is not\n".

 			      "supported. If you find out what chips are on your board, check\n".

-			      "http://www.lm-sensors.org/wiki/Devices for driver status.\n";

+			      "https://hwmon.wiki.kernel.org/device_support_status for driver status.\n";

 		}

 		exit;

 	}

diff --git a/prog/dump/isadump.8 b/prog/dump/isadump.8

index 6bf5ea4a..1fa09fd0 100644

--- a/prog/dump/isadump.8

+++ b/prog/dump/isadump.8

@@ -107,7 +107,7 @@ i2cdump(8), isaset(8)

 .SH AUTHOR

 Frodo Looijaard, Mark D. Studebaker, and the lm_sensors group

-(http://www.lm-sensors.org/)

+(https://hwmon.wiki.kernel.org/lm_sensors)

 .PP

 This manual page was originally written by David Z Maze <dmaze@debian.org> for

 the Debian GNU/Linux system. It was then reviewed and augmented by the lm_sensors

diff --git a/prog/dump/isaset.8 b/prog/dump/isaset.8

index e7bcd5db..4051af9e 100644

--- a/prog/dump/isaset.8

+++ b/prog/dump/isaset.8

@@ -77,7 +77,7 @@ i2cset(8), isadump(8)

 .SH AUTHOR

 Mark D. Studebaker, and the lm_sensors group

-(http://www.lm-sensors.org/)

+(https://hwmon.wiki.kernel.org/lm_sensors)

 .PP

 This manual page was shamelessly ripped from the i2cset and isadump manual

 pages by Jean Delvare.

diff --git a/prog/init/lm_sensors.init b/prog/init/lm_sensors.init

index 77172d24..2ad58abc 100755

--- a/prog/init/lm_sensors.init

+++ b/prog/init/lm_sensors.init

@@ -20,7 +20,7 @@

 #    MA 02110-1301 USA.

 # See also the lm_sensors homepage at:

-#     http://www.lm-sensors.org

+#     https://hwmon.wiki.kernel.org/lm_sensors

 # It uses a config file /etc/sysconfig/lm_sensors that contains the modules

 # to be loaded/unloaded. That file is sourced into this one.

diff --git a/prog/rrd/sens_day.in b/prog/rrd/sens_day.in

index 75dc13bd..15412f2b 100644

--- a/prog/rrd/sens_day.in

+++ b/prog/rrd/sens_day.in

@@ -217,7 +217,7 @@ See also: 

 This page generated with data and scripts from

-the lm_sensors project;

+the lm_sensors project;

 the data are stored in a Round Robin Database and

 the graphs are generated by

diff --git a/prog/rrd/sens_week.in b/prog/rrd/sens_week.in

index cce50555..2b92f655 100644

--- a/prog/rrd/sens_week.in

+++ b/prog/rrd/sens_week.in

@@ -217,7 +217,7 @@ See also: 

 This page generated with data and scripts from

-the lm_sensors project;

+the lm_sensors project;

 the data are stored in a Round Robin Database and

 the graphs are generated by

diff --git a/prog/rrd/summ_week.in b/prog/rrd/summ_week.in

index 713197dc..7051d5f0 100644

--- a/prog/rrd/summ_week.in

+++ b/prog/rrd/summ_week.in

@@ -89,7 +89,7 @@ See also: 

 This page generated with data and scripts from

-the lm_sensors project;

+the lm_sensors project;

 the data are stored in a Round Robin Database and

 the graphs are generated by

diff --git a/prog/sensord/rrd.c b/prog/sensord/rrd.c

index 3cde7f18..a531362b 100644

--- a/prog/sensord/rrd.c

+++ b/prog/sensord/rrd.c

@@ -498,7 +498,8 @@ int rrdCGI(void)

 	printf("
\n<small>sensord by "

 	       "Merlin Hughes"

 	       ", all credit to the "

-	       "lm_sensors "

+	       ""

+	       "lm_sensors "

 	       "crew.</small>\n
\n");

 	printf("</body>\n</html>\n");

diff --git a/prog/sensors/sensors.1 b/prog/sensors/sensors.1

index c787e4a2..16d3e61b 100644

--- a/prog/sensors/sensors.1

+++ b/prog/sensors/sensors.1

@@ -91,6 +91,6 @@ sensors.conf(5)

 .SH AUTHOR

 Frodo Looijaard and the lm_sensors group

-http://www.lm-sensors.org/

+https://hwmon.wiki.kernel.org/lm_sensors

diff --git a/prog/tellerstats/index.shtml b/prog/tellerstats/index.shtml

index 60c8ca14..1b71376e 100644

--- a/prog/tellerstats/index.shtml

+++ b/prog/tellerstats/index.shtml

@@ -40,7 +40,7 @@ These plots were generated 

 This page generated with drivers and the tellerstats scripts from

-The lm_sensors drivers.

+The lm_sensors drivers.

-- 

2.20.1