[ax25-apps] /listen/ripdump.c released under BSD. Added LICENSE, patched source.

Randall 'Randy' Berry dp67 at fedoraproject.org
Wed Dec 19 03:41:59 UTC 2012


commit 4ade987b2fa95a582a3e6a82e953429773be9218
Author: Randy Berry <randyn3lrx at gmail.com>
Date:   Tue Dec 18 22:41:50 2012 -0500

    /listen/ripdump.c released under BSD. Added LICENSE, patched source.

 LICENSE                                  |   27 ++++++++++++++++
 ax25-apps-0.0.6-ripdump.bsd.switch.patch |   50 ++++++++++++++++++++++++++++++
 ax25-apps.spec                           |    9 +++++-
 3 files changed, 85 insertions(+), 1 deletions(-)
---
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..e1bda7c
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,27 @@
+ Copyright 1991 Phil Karn, KA9Q
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions
+  are met:
+  1. Redistributions of source code must retain the above copyright
+     notice, this list of conditions and the following disclaimer.
+  2. Redistributions in binary form must reproduce the above copyright
+     notice, this list of conditions and the following disclaimer in the
+     documentation and/or other materials provided with the distribution.
+  3. Neither the name of the University nor the names of its contributors
+     may be used to endorse or promote products derived from this software
+     without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER(S) ``AS IS'' AND ANY
+ EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT HOLDER(S) BE
+ LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+ OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+ Rehack for RIP-2 (RFC1388) by N0POY 4/1993
diff --git a/ax25-apps-0.0.6-ripdump.bsd.switch.patch b/ax25-apps-0.0.6-ripdump.bsd.switch.patch
new file mode 100644
index 0000000..1ae5ae0
--- /dev/null
+++ b/ax25-apps-0.0.6-ripdump.bsd.switch.patch
@@ -0,0 +1,50 @@
+diff -up ./listen/ripdump.c.original ./listen/ripdump.c
+--- ./listen/ripdump.c.original	2012-12-18 05:35:04.409844742 -0500
++++ ./listen/ripdump.c	2012-12-18 05:34:31.300622268 -0500
+@@ -1,17 +1,32 @@
+-/* RIP packet tracing
+- * Copyright 1991 Phil Karn, KA9Q
+- *
+- *  Changes Copyright (c) 1993 Jeff White - N0POY, All Rights Reserved.
+- *  Permission granted for non-commercial copying and use, provided
+- *  this notice is retained.
+- *
+- * Rehack for RIP-2 (RFC1388) by N0POY 4/1993
+- *
+- * Beta release 11/10/93 V0.91
+- *
+- * 2/19/94 release V1.0
+- *
+- */
++/*   * Copyright 1991 Phil Karn, KA9Q
++*
++*  Redistribution and use in source and binary forms, with or without
++*  modification, are permitted provided that the following conditions
++*  are met:
++*  1. Redistributions of source code must retain the above copyright
++*     notice, this list of conditions and the following disclaimer.
++*  2. Redistributions in binary form must reproduce the above copyright
++*     notice, this list of conditions and the following disclaimer in the
++*     documentation and/or other materials provided with the distribution.
++*  3. Neither the name of the University nor the names of its contributors
++*     may be used to endorse or promote products derived from this software
++*     without specific prior written permission.
++*
++*  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER(S) ``AS IS'' AND ANY
++*  EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
++*  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
++*  PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT HOLDER(S) BE
++*  LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
++*  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
++*  SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
++*  BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
++*  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
++*  OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
++*  EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
++*
++* Rehack for RIP-2 (RFC1388) by N0POY 4/1993
++*
++*/
+ 
+ #include <stdio.h>
+ 
diff --git a/ax25-apps.spec b/ax25-apps.spec
index 4912440..3f20539 100644
--- a/ax25-apps.spec
+++ b/ax25-apps.spec
@@ -8,6 +8,7 @@ Group:		Applications/Communications
 License:	GPLv2+ and BSD
 URL:		http://ax25.sourceforge.net/
 Source0:	http://downloads.sourceforge.net/ax25/%{name}-%{version}.tar.gz
+Source1:	LICENSE
 #listen and call are too generic names, rename to axlisten and axcall in all instances, thanks debian maintainers
 Patch0:		%{name}-%{version}-nongenericnames.patch
 # Patch1:	%%{name}-%%{version}-configure.in.patch
@@ -45,6 +46,7 @@ Net/ROM or ROSE network protocols:
 %patch3 -p1
 %patch4 -p1
 
+
 %build
 #the patch requires rebuilding of makefiles and such
 #libtoolize
@@ -53,10 +55,14 @@ autoreconf -if
 %configure
 make %{?_smp_mflags}
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
+#Install BSD License text
+install -p -D -m 0644 %{SOURCE1} ${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}/LICENSE
+
 #don't include these twice
 rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}
 
@@ -88,8 +94,9 @@ rm -rf $RPM_BUILD_ROOT
 - Author re-released source in question under BSD
 - http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=630893
 - BZ: #888206 https://bugzilla.redhat.com/show_bug.cgi?id=888206
+- Add BSD license text to package.
 
-* Sat Aug 05 2012 Randall Berry, N3LRX <dp67 at fedoraproject.org> - 0.0.6-11
+* Sun Aug 05 2012 Randall Berry, N3LRX <dp67 at fedoraproject.org> - 0.0.6-11
 - Cleanup build for F18/Rawhide
 - Remove patch1 0 byte file
 


More information about the scm-commits mailing list