Skip to content

Commit d06d776

Browse files
author
Nima Talebi
committed
Reversioned, relicensed, and rejigged
The version is of now, v3.10.6. The version major field has been upped due to the newly added XML functionality. The version has been reverted to GPLv2. Some headers have been cleaned up, copyright notices added etc. Credits given where due.
1 parent cd387fa commit d06d776

11 files changed

Lines changed: 152 additions & 63 deletions

File tree

‎.autoheader‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
2+
© 2007-2009 Nima Talebi <nima@autonomy.net.au>
3+
© 2009 David Sommerseth <davids@redhat.com>
4+
© 2002-2008 Jean Delvare <khali@linux-fr.org>
5+
© 2000-2002 Alan Cox <alan@redhat.com>
6+
7+
This file is part of @PKG@.
8+
9+
@PKG@ is free software: you can redistribute it and/or modify
10+
it under the terms of the GNU General Public License as published by
11+
the Free Software Foundation, either version 2 of the License, or
12+
(at your option) any later version.
13+
14+
@PKG@ is distributed in the hope that it will be useful,
15+
but WITHOUT ANY WARRANTY; without even the implied warranty of
16+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
17+
GNU General Public License for more details.
18+
19+
You should have received a copy of the GNU General Public License
20+
along with @PKG@. If not, see <http://www.gnu.org/licenses/>.
21+
22+
THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
23+
WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
24+
MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
25+
EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
26+
INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
27+
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
28+
PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
29+
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
30+
OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
31+
ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
32+
33+
ADAPTED M. STONE & T. PARKER DISCLAIMER: THIS SOFTWARE COULD RESULT IN INJURY
34+
AND/OR DEATH, AND AS SUCH, IT SHOULD NOT BE BUILT, INSTALLED OR USED BY ANYONE.
35+
36+
$AutoHeaderSerial::@SERIAL@ $

‎Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
#.
44
#. (C) 2008 Nima Talebi <nima@it.net.au>
55
#.
6-
#. Licensed under the GNU Public License v3
6+
#. Licensed under the GNU Public License v2
77
#.
88

9-
VERSION := 2.10
9+
VERSION := 3.10.6
1010
PY := $(shell python -V 2>&1 |sed -e 's/.\(ython\) \(2\.[0-9]\)\..*/p\1\2/')
1111
PY_VER := $(subst python,,$(PY))
1212
PACKAGE := python-dmidecode

‎debian/changelog‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
python-dmidecode (3.10.6-1) unstable; urgency=low
2+
3+
* Introducing the XML extensions to python-dmidecode, by of David Sommerseth
4+
from Red Hat. A big thankyou to David, Red Hat, and other people from
5+
Red Hat that contributed (and are still contributing) time and knowledge
6+
to this project.
7+
8+
-- Nima Talebi <nima@it.net.au> Fri, 22 May 2009 20:28:08 +1000
9+
110
python-dmidecode (2.10.6-1) unstable; urgency=low
211

312
* David Sommerseth, as part of wrting the XML (libxml2) extensions to

‎debian/copyright‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@ It was downloaded from http://projects.autonomy.net.au/dmidecode/
1313
Upstream Author: Nima Talebi <nima@autonomy.net.au>
1414

1515
The Debian packaging is © 2008, Nima Talebi <nima@it.net.au> and is licensed
16-
under the GPL, see `/usr/share/common-licenses/GPL-3'.
16+
under the GPL, see `/usr/share/common-licenses/GPL-2'.
1717

1818
License:
19-
GPLv3 - The python-dmidecode packages is available under the terms of
19+
GPLv2 - The python-dmidecode packages is available under the terms of
2020
the GNU General Public license version 3. On Debian systems, the complete
2121
text of the GNU General Public License can be found in
22-
`/usr/share/common-licenses/GPL-3'.
22+
`/usr/share/common-licenses/GPL-2'.
2323

2424

2525
DMIDecode

‎doc/AUTHORS‎

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,20 @@
11
DEVELOPER AND MAINTAINER OF PYTHON MODULE (http://projects.autonomy.net.au/dmidecode)
2-
Nima Talebi <nima@it.net.au>
2+
Nima Talebi <nima@it.net.au>
3+
David Sommerseth <davids@redhat.com>
34

45
DEVELOPER AND MAINTAINER OF DMIDECODE (Please see http://www.nongnu.org/dmidecode)
5-
Jean Delvare <khali@linux-fr.org>
6+
Jean Delvare <khali@linux-fr.org>
67

78
ORIGINAL AUTHOR
8-
Alan Cox <alan@redhat.com>
9+
Alan Cox <alan@redhat.com>
910

1011
MANY THANKS TO (IN CHRONOLOGICAL ORDER)
11-
Jean Delvare <khali@linux-fr.org>
12-
Stephen Darragh <srd@it.net.au>
13-
Joel Heenan <joel.heenan@det.nsw.edu.au>
14-
Vaughan Whitteron <vaughan.whitteron@det.nsw.edu.au>
15-
Justin Cook
12+
David Sommerseth <davids@redhat.com>
13+
Clark Williams
14+
Daniel Veillard
15+
Richard Fontana
16+
Jean Delvare <khali@linux-fr.org>
17+
Stephen Darragh <srd@it.net.au>
18+
Joel Heenan <joel.heenan@det.nsw.edu.au>
19+
Vaughan Whitteron <vaughan.whitteron@det.nsw.edu.au>
20+
Justin Cook

‎python-dmidecode.spec‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,17 @@
33

44
Summary: python extension module to access DMI data
55
Name: python-dmidecode
6-
Version: 2.10
6+
Version: 3.10.6
77
Release: 1
8-
License: GPLv3
8+
License: GPLv2
99
Group: System Environment/Libraries
1010
URL: http://projects.autonomy.net.au/dmidecode/
1111
Source0: %{name}-%{version}.tar.gz
1212
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
1313

1414
%description
15-
python-dmidecode is a python extension module that uses the
16-
code-base of the 'dmidecode' utility, and presents the data
15+
python-dmidecode is a python extension module that uses the
16+
code-base of the 'dmidecode' utility, and presents the data
1717
as python data structures
1818

1919
%prep

‎src/dmidecode.c‎

Lines changed: 42 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,48 @@
11

2+
/*. ******* coding:utf-8 AUTOHEADER START v1.1 *******
3+
*. vim: fileencoding=utf-8 syntax=c sw=2 ts=2 et
4+
*.
5+
*. © 2007-2009 Nima Talebi <nima@autonomy.net.au>
6+
*. © 2009 David Sommerseth <davids@redhat.com>
7+
*. © 2002-2008 Jean Delvare <khali@linux-fr.org>
8+
*. © 2000-2002 Alan Cox <alan@redhat.com>
9+
*.
10+
*. This file is part of Python DMI-Decode.
11+
*.
12+
*. Python DMI-Decode is free software: you can redistribute it and/or modify
13+
*. it under the terms of the GNU General Public License as published by
14+
*. the Free Software Foundation, either version 2 of the License, or
15+
*. (at your option) any later version.
16+
*.
17+
*. Python DMI-Decode is distributed in the hope that it will be useful,
18+
*. but WITHOUT ANY WARRANTY; without even the implied warranty of
19+
*. MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
20+
*. GNU General Public License for more details.
21+
*.
22+
*. You should have received a copy of the GNU General Public License
23+
*. along with Python DMI-Decode. If not, see <http://www.gnu.org/licenses/>.
24+
*.
25+
*. THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
26+
*. WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
27+
*. MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
28+
*. EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
29+
*. INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
30+
*. LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
31+
*. PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
32+
*. LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
33+
*. OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
34+
*. ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
35+
*.
36+
*. ADAPTED M. STONE & T. PARKER DISCLAIMER: THIS SOFTWARE COULD RESULT IN INJURY
37+
*. AND/OR DEATH, AND AS SUCH, IT SHOULD NOT BE BUILT, INSTALLED OR USED BY ANYONE.
38+
*.
39+
*. $AutoHeaderSerial::20090522 $
40+
*. ******* AUTOHEADER END v1.1 ******* */
41+
242
/*
3-
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
43+
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
444
* DMI Decode
545
*
6-
* Copyright 2000-2002 Alan Cox <alan@redhat.com>
7-
* Copyright 2002-2008 Jean Delvare <khali@linux-fr.org>
8-
* Copyright 2009 David Sommerseth <davids@redhat.com>
9-
*
10-
* This program is free software; you can redistribute it and/or modify
11-
* it under the terms of the GNU General Public License as published by
12-
* the Free Software Foundation; either version 2 of the License, or
13-
* (at your option) any later version.
14-
*
15-
* This program is distributed in the hope that it will be useful,
16-
* but WITHOUT ANY WARRANTY; without even the implied warranty of
17-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
18-
* GNU General Public License for more details.
19-
*
20-
* You should have received a copy of the GNU General Public License
21-
* along with this program; if not, write to the Free Software
22-
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
23-
*
24-
* For the avoidance of doubt the "preferred form" of this code is one which
25-
* is in an open unpatent encumbered format. Where cryptographic key signing
26-
* forms part of the process of creating an executable the information
27-
* including keys needed to generate an equivalently functional executable
28-
* are deemed to be part of the source code.
29-
*
3046
* Unless specified otherwise, all references are aimed at the "System
3147
* Management BIOS Reference Specification, Version 2.6" document,
3248
* available from http://www.dmtf.org/standards/smbios/.
@@ -51,14 +67,7 @@
5167
* - BIOS Integrity Services Application Programming Interface version 1.0
5268
* http://www.intel.com/design/archives/wfm/downloads/bisspec.htm
5369
*
54-
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
55-
* DMI Decode Python module & libxml2 (Extension)
56-
*
57-
* Copyright: 2007-2009 Nima Talebi <nima@it.net.au>
58-
* Copyright: 2009 David Sommerseth <davids@redhat.com>
59-
* License: GPLv3
60-
*
61-
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
70+
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
6271
*/
6372

6473
#include <assert.h>
@@ -81,7 +90,6 @@
8190
#define EFI_NOT_FOUND (-1)
8291
#define EFI_NO_SMBIOS (-2)
8392

84-
8593
/*******************************************************************************
8694
** Type-independant Stuff
8795
*/

‎src/dmidecodemodule.c‎

Lines changed: 40 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,43 @@
1-
/*
2-
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
3-
* DMI Decode Python module & libxml2 (Extension)
4-
*
5-
* Copyright: 2007-2009 Nima Talebi <nima@it.net.au>
6-
* Copyright: 2009 David Sommerseth <davids@redhat.com>
7-
* License: GPLv3
8-
*
9-
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
10-
*/
1+
2+
/*. ******* coding:utf-8 AUTOHEADER START v1.1 *******
3+
*. vim: fileencoding=utf-8 syntax=c sw=2 ts=2 et
4+
*.
5+
*. © 2007-2009 Nima Talebi <nima@autonomy.net.au>
6+
*. © 2009 David Sommerseth <davids@redhat.com>
7+
*. © 2002-2008 Jean Delvare <khali@linux-fr.org>
8+
*. © 2000-2002 Alan Cox <alan@redhat.com>
9+
*.
10+
*. This file is part of Python DMI-Decode.
11+
*.
12+
*. Python DMI-Decode is free software: you can redistribute it and/or modify
13+
*. it under the terms of the GNU General Public License as published by
14+
*. the Free Software Foundation, either version 2 of the License, or
15+
*. (at your option) any later version.
16+
*.
17+
*. Python DMI-Decode is distributed in the hope that it will be useful,
18+
*. but WITHOUT ANY WARRANTY; without even the implied warranty of
19+
*. MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
20+
*. GNU General Public License for more details.
21+
*.
22+
*. You should have received a copy of the GNU General Public License
23+
*. along with Python DMI-Decode. If not, see <http://www.gnu.org/licenses/>.
24+
*.
25+
*. THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
26+
*. WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
27+
*. MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
28+
*. EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
29+
*. INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
30+
*. LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
31+
*. PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
32+
*. LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
33+
*. OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
34+
*. ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
35+
*.
36+
*. ADAPTED M. STONE & T. PARKER DISCLAIMER: THIS SOFTWARE COULD RESULT IN INJURY
37+
*. AND/OR DEATH, AND AS SUCH, IT SHOULD NOT BE BUILT, INSTALLED OR USED BY ANYONE.
38+
*.
39+
*. $AutoHeaderSerial::20090522 $
40+
*. ******* AUTOHEADER END v1.1 ******* */
1141

1242
#include <Python.h>
1343

‎src/setup-dbg.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
setup(
44
name = "python-dmidecode-dbg",
5-
version = "2.10.6",
5+
version = "3.10.6",
66
description = "Python extension module for dmidecode",
77
author = "Nima Talebi & David Sommerseth",
88
author_email = "nima@it.net.au, davids@redhat.com",

‎src/setup.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
setup(
44
name = "python-dmidecode",
5-
version = "2.10.5",
5+
version = "3.10.5",
66
description = "Python extension module for dmidecode",
77
author = "Nima Talebi & David Sommerseth",
88
author_email = "nima@it.net.au, davids@redhat.com",

0 commit comments

Comments
 (0)