[ax25-apps/f17] Source re-released under BSD, included LICENSE and patched source.

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

commit 0023118fe9061da32dde544d1706100f60ba9db7
Author: Randy Berry <randyn3lrx at gmail.com>
Date:   Tue Dec 18 22:53:51 2012 -0500

    Source re-released under BSD, included LICENSE and patched source.

 LICENSE                                  |   27 ++++++++++
 ax25-apps-0.0.6-config.patch             |   61 -----------------------
 ax25-apps-0.0.6-ripdump.bsd.switch.patch |   50 +++++++++++++++++++
 ax25-apps-ax25rtd-config_c.patch         |   55 +++++++++++++++++++++
 ax25-apps.spec                           |   77 ++++++++++++++++++++----------
 5 files changed, 184 insertions(+), 86 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-ax25rtd-config_c.patch b/ax25-apps-ax25rtd-config_c.patch
new file mode 100644
index 0000000..7b2236d
--- /dev/null
+++ b/ax25-apps-ax25rtd-config_c.patch
@@ -0,0 +1,55 @@
+diff -up ./ax25rtd/config.c.orig ./ax25rtd/config.c
+--- ./ax25rtd/config.c.orig	2001-10-08 21:03:24.000000000 -0400
++++ ./ax25rtd/config.c	2012-08-05 02:13:22.292126714 -0400
+@@ -38,9 +38,9 @@
+ #include <net/if_arp.h>
+ 
+ #include <config.h>
+-#include <netax25/kernel_ax25.h>
+-#include <netax25/kernel_rose.h>
+-#include <netax25/axlib.h>
++#include <linux/ax25.h>
++#include <linux/rose.h>
++/* #include <netax25/axlib.h> */
+ #include <netax25/axconfig.h>
+ 
+ #include "../pathnames.h"
+diff -up ./call/call.c.orig ./call/call.c
+--- ./call/call.c.orig	2001-11-26 23:41:39.000000000 -0500
++++ ./call/call.c	2012-08-05 02:26:54.141750206 -0400
+@@ -40,20 +40,20 @@
+ #ifdef HAVE_NETAX25_AX25_H
+ #include <netax25/ax25.h>
+ #else
+-#include <netax25/kernel_ax25.h>
++#include <netax25/ax25.h>
+ #endif
+ #ifdef HAVE_NETROM_NETROM_H
+ #include <netrom/netrom.h>
+ #else
+-#include <netax25/kernel_netrom.h>
++#include <netrom/netrom.h>
+ #endif
+ #ifdef HAVE_NETROSE_ROSE_H
+ #include <netrose/rose.h>
+ #else
+-#include <netax25/kernel_rose.h>
++#include <netrose/rose.h>
+ #endif
+ 
+-#include <netax25/axlib.h>
++/* #include <netax25/axlib.h> */
+ #include <netax25/axconfig.h>
+ #include <netax25/nrconfig.h>
+ #include <netax25/rsconfig.h>
+--- ./listen/listen.c~	2012-08-06 13:45:33.000000000 -0500
++++ ./listen/listen.c	2012-08-06 13:46:31.161014388 -0500
+@@ -20,7 +20,7 @@
+ #ifdef HAVE_NETAX25_AX25_H
+ #include <netax25/ax25.h>
+ #else
+-#include <netax25/kernel_ax25.h>
++#include <netax25/ax25.h>
+ #endif
+ #include <netax25/axconfig.h>
+ 
diff --git a/ax25-apps.spec b/ax25-apps.spec
index 9be5da6..3f20539 100644
--- a/ax25-apps.spec
+++ b/ax25-apps.spec
@@ -1,27 +1,32 @@
-Name:           ax25-apps
-Version:        0.0.6
-Release:        9%{?dist}
-Summary:        AX.25 ham radio applications
+Name:		ax25-apps
+Version:	0.0.6
+Release:	12%{?dist}
+Summary:	AX.25 ham radio applications
 
-Group:          Applications/Communications
+Group:		Applications/Communications
 #ax25ipd is BSD licensed, rest is GPLv2+
-License:        GPLv2+ and BSD
-URL:            http://ax25.sourceforge.net/
-Source0:        http://downloads.sourceforge.net/ax25/%{name}-%{version}.tar.gz
+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}-Makefile.am.patch
-Patch2:		%{name}-%{version}-config.patch
-
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:  autoconf
-BuildRequires:	automake14
+Patch0:		%{name}-%{version}-nongenericnames.patch
+# Patch1:	%%{name}-%%{version}-configure.in.patch
+Patch2:		%{name}-%{version}-Makefile.am.patch
+Patch3:		%{name}-ax25rtd-config_c.patch
+#Source released by author as BSD http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=630893
+Patch4:		%{name}-%{version}-ripdump.bsd.switch.patch
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires:	autoconf
+BuildRequires:	automake
 BuildRequires:	libtool
-BuildRequires:  libax25-devel
-BuildRequires:	ncurses-devel       
+BuildRequires:	libax25-devel
+BuildRequires:	ncurses-devel
+
 
 %description
+
 This package provides specific user applications for hamradio that use AX.25 
 Net/ROM or ROSE network protocols:
 
@@ -36,28 +41,36 @@ Net/ROM or ROSE network protocols:
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
+# %%patch1 -p1
 %patch2 -p1
+%patch3 -p1
+%patch4 -p1
+
 
 %build
 #the patch requires rebuilding of makefiles and such
-libtoolize
-aclocal; autoconf; automake --add-missing
+#libtoolize
+#aclocal; autoconf; automake --add-missing
+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}
 
 # Fix the encoding on the doc files to be UTF-8
 recode()
 {
-        iconv -f "$2" -t utf-8 < "$1" > "${1}_"
-        mv -f "${1}_" "$1"
+	iconv -f "$2" -t utf-8 < "$1" > "${1}_"
+	mv -f "${1}_" "$1"
 }
 recode AUTHORS iso-8859-15
 
@@ -76,8 +89,22 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man?/*
 
 %changelog
-* Fri Apr 20 2012 Randall Berry, N3LRX <dp67 at fedoraproject.org> - 0.0.6-9
-- Rebuild for f17
+* Tue Dec 18 2012 Randall Berry, N3LRX <dp67 at fedoraproject.org> - 0.0.6-12
+- Add patch to relicense /listen/ripdump.c
+- 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.
+
+* 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
+
+* Wed Jul 18 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.0.6-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Thu Jan 12 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.0.6-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 
 * Thu Jun 23 2011 Randall Berry, N3LRX <dp67 at fedoraproject.org> - 0.0.6-8
 - Rebuild for Rawhide

More information about the scm-commits mailing list