tags 508292 + patch
thanks

Dear maintainer,

I've prepared an NMU for gkrellm-snmp (versioned as 1.1-1.1), which contains 
the clarified license
by the upstream author.
Please tell me if I can proceed with the NMU, I'm going to ask debian-release 
if it's suitable for
a testing-proposed-updates upload.

Regards,
David Paleino
diff -Nru gkrellm-snmp-1.0/ChangeLog gkrellm-snmp-1.1/ChangeLog
--- gkrellm-snmp-1.0/ChangeLog  2006-05-25 16:40:35.000000000 +0200
+++ gkrellm-snmp-1.1/ChangeLog  2009-01-03 18:43:32.000000000 +0100
@@ -1,5 +1,9 @@
 GKrellM_SNMP Changelog:
 
+1.1 (2009-01-03)
+ - License clarification (thanks to Debian maintainers)
+ - Removed unnecessary linking to libssl
+
 1.0 (2006-05-01)
  - Makefile changes for OS-X (thanks to Mark Duling)
  - Added grid config to charts
diff -Nru gkrellm-snmp-1.0/debian/changelog gkrellm-snmp-1.1/debian/changelog
--- gkrellm-snmp-1.0/debian/changelog   2009-01-03 22:27:07.000000000 +0100
+++ gkrellm-snmp-1.1/debian/changelog   2009-01-03 22:27:07.000000000 +0100
@@ -1,3 +1,12 @@
+gkrellm-snmp (1.1-1.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * New upstream release, author added OpenSSL exemption to his 
+    licensing (Closes: #508292)
+  * debian/copyright updated with the new information.
+
+ -- David Paleino <d.pale...@gmail.com>  Sat, 03 Jan 2009 22:21:42 +0100
+
 gkrellm-snmp (1.0-1.1) unstable; urgency=low
 
   * Non-maintainer upload.
diff -Nru gkrellm-snmp-1.0/debian/copyright gkrellm-snmp-1.1/debian/copyright
--- gkrellm-snmp-1.0/debian/copyright   2009-01-03 22:27:07.000000000 +0100
+++ gkrellm-snmp-1.1/debian/copyright   2009-01-03 22:27:07.000000000 +0100
@@ -7,23 +7,33 @@
 
 Upstream Author: Christian W. Zuckschwerdt <z...@triq.net>
 
-Copyright: Copyright (C) 2000-2006 Christian W. Zuckschwerdt <z...@triq.net>
+Copyright: Copyright (C) 2000-2009 Christian W. Zuckschwerdt <z...@triq.net>
 
 License:
 --------------------------------------------------------------------------
-This program is free software which I release under the GNU General Public
-License. You may redistribute and/or modify this program under the terms
-of that license as published by the Free Software Foundation; either
-version 2 of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-To get a copy of the GNU General Puplic License,  write to the Free
-Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-02110-1301, USA.
+  GKrellM_SNMP is free software; you can redistribute it and/or
+  modify it under the terms of the GNU General Public License as
+  published by the Free Software Foundation; either version 2 of
+  the License, or (at your option) any later version.
+
+  In addition, as a special exception, the copyright holders give
+  permission to link the code of this program with the OpenSSL library,
+  and distribute linked combinations including the two.
+  You must obey the GNU General Public License in all respects
+  for all of the code used other than OpenSSL.  If you modify
+  file(s) with this exception, you may extend this exception to your
+  version of the file(s), but you are not obligated to do so.  If you
+  do not wish to do so, delete this exception statement from your
+  version.  If you delete this exception statement from all source
+  files in the program, then also delete it here.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with GKrellM_SNMP. If not, see <http://www.gnu.org/>.
 
 On Debian GNU/Linux systems, the complete text of the GNU General
 Public License can be found in `/usr/share/common-licenses/GPL'.
diff -Nru gkrellm-snmp-1.0/FAQ gkrellm-snmp-1.1/FAQ
--- gkrellm-snmp-1.0/FAQ        2006-05-25 16:43:55.000000000 +0200
+++ gkrellm-snmp-1.1/FAQ        2009-01-03 19:41:46.000000000 +0100
@@ -1,5 +1,5 @@
 GKrellM_SNMP FAQ:
-
+=================
 
 > I've downloaded v0.9 of GKrellM_SNMP, and it seams like i'm missing
 > crypto libs... Where can i get them?
diff -Nru gkrellm-snmp-1.0/gkrellm_snmp.c gkrellm-snmp-1.1/gkrellm_snmp.c
--- gkrellm-snmp-1.0/gkrellm_snmp.c     2006-05-25 16:50:35.000000000 +0200
+++ gkrellm-snmp-1.1/gkrellm_snmp.c     2009-01-03 19:50:54.000000000 +0100
@@ -1,22 +1,32 @@
 /* SNMP reader plugin for GKrellM 
-|  Copyright (C) 2000-2006  Christian W. Zuckschwerdt <z...@triq.net>
+|  Copyright (C) 2000-2009  Christian W. Zuckschwerdt <z...@triq.net>
 |
 |  Author:  Christian W. Zuckschwerdt  <z...@triq.net>  http://triq.net/
 |  Latest versions might be found at:  http://gkrellm.net/
 |
-| This program is free software; you can redistribute it and/or
-| modify it under the terms of the GNU General Public License
-| as published by the Free Software Foundation; either version 2
-| of the License, or (at your option) any later version.
+| GKrellM_SNMP is free software; you can redistribute it and/or
+| modify it under the terms of the GNU General Public License as
+| published by the Free Software Foundation; either version 2 of
+| the License, or (at your option) any later version.
 |
+| In addition, as a special exception, the copyright holders give
+| permission to link the code of this program with the OpenSSL library,
+| and distribute linked combinations including the two.
+| You must obey the GNU General Public License in all respects
+| for all of the code used other than OpenSSL.  If you modify
+| file(s) with this exception, you may extend this exception to your
+| version of the file(s), but you are not obligated to do so.  If you
+| do not wish to do so, delete this exception statement from your
+| version.  If you delete this exception statement from all source
+| files in the program, then also delete it here.
+
 | This program is distributed in the hope that it will be useful,
 | but WITHOUT ANY WARRANTY; without even the implied warranty of
 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 | GNU General Public License for more details.
-|
+
 | You should have received a copy of the GNU General Public License
-| along with this program; if not, write to the Free Software
-| Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+| along with GKrellM_SNMP. If not, see <http://www.gnu.org/>.
 */
 
 /* Installation:
@@ -1394,7 +1404,7 @@
    "Copyright (C) 2000-2006 Christian W. Zuckschwerdt <z...@triq.net>\n"
    "\n"
    "http://triq.net/gkrellm.html\n\n";
-   "Released under the GNU Public Licence"
+   "Released under the GNU Public Licence with OpenSSL exemption"
 ;
 
 static gchar *reader_title[CLIST_WIDTH] =
diff -Nru gkrellm-snmp-1.0/Makefile gkrellm-snmp-1.1/Makefile
--- gkrellm-snmp-1.0/Makefile   2006-05-01 18:54:45.000000000 +0200
+++ gkrellm-snmp-1.1/Makefile   2009-01-03 19:41:37.000000000 +0100
@@ -4,8 +4,8 @@
 GTK_CONFIG ?= pkg-config gtk+-2.0
 SNMPLIB = -lnetsnmp
 SYSLIB ?= $(SNMPLIB)
-# we need lib crypto if libsnmp has privacy support.
-SYSLIB += -L/usr/local/ssl/lib -L/usr/ssl/lib -lcrypto
+# older systems need lib crypto if libsnmp has privacy support.
+# SYSLIB += -L/usr/local/ssl/lib -L/usr/ssl/lib -lcrypto
 
 USER_PLUGIN_DIR ?= $(HOME)/.gkrellm2/plugins
 PLUGIN_DIR ?= /usr/lib/gkrellm2/plugins
diff -Nru gkrellm-snmp-1.0/README gkrellm-snmp-1.1/README
--- gkrellm-snmp-1.0/README     2006-05-25 16:48:40.000000000 +0200
+++ gkrellm-snmp-1.1/README     2009-01-03 19:40:41.000000000 +0100
@@ -1,46 +1,45 @@
+GKrellM_SNMP README
+===================
 
-gkrellm_snmp: GKrellM SNMP monitor Plugin
-Author:    Christian W. Zuckschwerdt <z...@triq.net>
-Homepage:  http://triq.net/gkrellm/
+- gkrellm_snmp: GKrellM SNMP monitor Plugin
+- Author:    Christian W. Zuckschwerdt <z...@triq.net>
+- Homepage:  http://triq.net/gkrellm/
 
 
-A plugin for GKrellM, that let's you monitor SNMP vars.
+**A plugin for GKrellM, that let's you monitor SNMP vars.**
 
 
 Prerequisites:
-===============
+--------------
 You need a SNMP library to run this plugin.
-You also need the header (include) files for building.
-Tested with UCD-SNMP >= 4.1 ( http://ucd-snmp.ucdavis.edu/ ).
-(If you want to try -old- CMU-SNMP or UCD-SNMP <= 4.0, please be so kind
- and mail some feedback).
-
-The UCD-SNMP project is know as NETSNMP now. If you have NETSNMP installed
-please try "make netsnmp" and let me know if it works.
+You also need the SNMP header (include) files for building (as well as
+GTK-2.0 and GKrellM headers).
+Tested with UCD-SNMP and Net-SNMP.
+(If you want to link to the -old- UCD-SNMP try "make ucdsnmp").
 
-This means for e.g. Redhat (7.1) you need to install ucd-smp as well as
-ucd-snmp-devel!
+This means for e.g. Debian/Ubuntu you need to install libsnmp-dev
+(and libgtk2.0-dev / gkrellm as well).
 
 Compiling:
-===========
+----------
 
 * For linux: just run the normal 'make'.
 * For freebsd: run 'make freebsd'.
-* To use NETSNMP run 'make netsnmp'.
+* For OS X: run 'make osx'.
 
 
 Installing:
-===========
+-----------
 Running 'make install-user' will place the plugin in your current home
-directory under ~/.gkrellm2/plugins.
+directory under $HOME/.gkrellm2/plugins.
 Running 'make install' as superuser will place the plugin under
 /usr/lib/gkrellm2/plugins. You can also manually place the resulting
-gkrellm_snmp.so under ~/.gkrellm2/plugins. After restarting gkrellm, you
+gkrellm_snmp.so under $HOME/.gkrellm2/plugins. After restarting gkrellm, you
 should be able to enable it in the gkrellm plugins configuration menu.
 
 
 Troubleshooting:
-================
+----------------
 If you have trouble compiling the plugin. Make sure you have gtk 2 and 
 gkrellm >= 2.0.0 and you've installed the gkrellm header files in
 /usr/include/gkrellm or /usr/local/include/gkrellm. If you have placed the
@@ -48,14 +47,14 @@
 
  
 Bugs:
-=====
+-----
 No GKrellm 1.x support anymore. Anyone needing that?
 I do consider this version stable.
-please mail any problems/bugs to me...
+Please mail any problems/bugs to me...
 
 
 Some examples:
-==============
+--------------
 
 (1)
 
@@ -105,7 +104,7 @@
 
 
 More interessting OIDs:
-=======================
+-----------------------
 - Chasis inlet temperature (tested on cisco7204VXR)
   CISCO-SMI::ciscoMgmt.13.1.3.1.3.1
  .1.3.6.1.4.1.9.9.13.1.3.1.3.1
@@ -144,7 +143,7 @@
 
 
 Call for features!
-==================
+------------------
 
 Do you want/need
  monitor multiple oid's on the same server? (snmp bulk get)
@@ -164,26 +163,25 @@
 
 
 Please help:
-============
+------------
 
 Can you give some usage examples?
 
 
-
 Tested on:
-==========
-FreeBSD  4.0 Release   w/ ucd-snmp-4.0.1   libcrypt not needed
-SuSE Linux 6.4   w/ ucd-snmp-4.0.1
-SuSE Linux 6.4   w/ ucd-snmp-4.1.1
-SuSE Linux 8.2   w/ ucd-snmp-4.2.6
-RedHad Linux 6.1
-Mac OS-X
-Gentoo Linux
-
+----------
+- FreeBSD  4.0 Release   w/ ucd-snmp-4.0.1   libcrypt not needed
+- SuSE Linux 6.4   w/ ucd-snmp-4.0.1
+- SuSE Linux 6.4   w/ ucd-snmp-4.1.1
+- SuSE Linux 8.2   w/ ucd-snmp-4.2.6
+- RedHad Linux 6.1
+- Mac OS-X
+- Gentoo Linux
+- Debian / Ubuntu
 
 
 Thanks to:
-==========
+----------
 
  Bill Wilson <bi...@gkrellm.net>
  (valuable feedback and last but not least making GKrellM!)
@@ -228,9 +226,9 @@
 
 
 AUTHOR AND WEBPAGE:
-===================
+-------------------
 
-Christian W. Zuckschwerdt  <z...@triq.net>
-GKrellM SNMP can be found at http://triq.net/gkrellm/
-and also at GKrellM homepage http://gkrellm.net
+- Christian W. Zuckschwerdt  <z...@triq.net>
+- GKrellM SNMP can be found at http://triq.net/gkrellm/
+- and also at GKrellM homepage http://gkrellm.net/
 
diff -Nru gkrellm-snmp-1.0/TODO gkrellm-snmp-1.1/TODO
--- gkrellm-snmp-1.0/TODO       2006-05-03 03:02:03.000000000 +0200
+++ gkrellm-snmp-1.1/TODO       2009-01-03 19:28:19.000000000 +0100
@@ -1,6 +1,5 @@
-
-TODO / WISHLIST:
-================
+GKrellM_SNMP TODO / WISHLIST
+============================
 
 TODO: instance mapping
 TODO: meters



-- 
To UNSUBSCRIBE, email to debian-bugs-rc-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

Reply via email to