Version 1.3

author: maze 2016-10-18 20:59:18 +0000
committer: maze 2016-10-18 20:59:18 +0000
commit: fce751252439bf541db22f5a02658151854bd3e8 (patch)
tree: eab3f842e54f35fff87b090ecb06b576d4902b50
parent: 5e8db55e67f4b44e67b31fb10faae8ef9a8d39a5 (diff)
download: aur-fce751252439bf541db22f5a02658151854bd3e8.tar.gz
5 files changed, 37 insertions, 147 deletions
diff --git a/.SRCINFO b/.SRCINFO
index c91478989f52..6f198a5d0ecc 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,6 @@
-# Generated by mksrcinfo v8
-# Sat Oct 17 01:59:52 UTC 2015
 pkgbase = direwolf
 	pkgdesc = Dire Wolf is a software modem/TNC and APRS encoder/decoder
-	pkgver = 1.2
+	pkgver = 1.3
 	pkgrel = 1
 	url = https://github.com/wb2osz/direwolf
 	arch = i686
@@ -15,18 +13,18 @@ pkgbase = direwolf
 	makedepends = patch
 	depends = alsa-lib
 	depends = gpsd
-	source = https://github.com/wb2osz/direwolf/archive/1.2.zip
+	source = https://github.com/wb2osz/direwolf/archive/1.3.zip
 	source = Makefile.patch
-	source = gps.patch
-	source = kiss.patch
 	source = direwolf.service
 	source = direwolf-kiss.service
-	sha1sums = 4d543ad206a9643003836eb5ccd9bbbaf86ab560
-	sha1sums = 878faf112044b24070c4c8480d89535e9c345b44
-	sha1sums = 462d0cecb55daf230d2b59faac3822d00cf4b6fe
-	sha1sums = 17d1fdf760b0929a0f1de8825623b63818603b43
+	sha1sums = 93201580ac2b8832bbcad2fca4438332710e4090
+	sha1sums = f94b193a8e49bae073de3cedff4394821d6148fa
 	sha1sums = 66366c7a4e8d3768013f9036f2681a86d4b8ad88
 	sha1sums = eea3a3fb334645cd8a1e2604dc6c6b024148722a
+	sha256sums = 9a1a151b42d5e83d306d04d56353826447d62e6e56d7ef162db4d5be4a0c0a86
+	sha256sums = 5a4bee3543da1bbe9cd8bd5edb3bb9b502728841c4c34da332a19f34f876a140
+	sha256sums = a1efe2bb96470bc52faa747708b195a685dc454f3d9c91f6bf4d39ab94d3608a
+	sha256sums = 2a2e4acc769a20afebdfdcd21640fd17b0c4217ceb7ecb3378f9ee5c45fadc68
 
 pkgname = direwolf
 
diff --git a/Makefile.patch b/Makefile.patch
index 0b9c6077bcf6..6c34dfb8accb 100644
--- a/Makefile.patch
+++ b/Makefile.patch
@@ -1,102 +1,20 @@
-diff -ur direwolf-1.2.org/Makefile.linux direwolf-1.2/Makefile.linux
---- direwolf-1.2.org/Makefile.linux	2015-07-27 01:17:23.000000000 +0000
-+++ direwolf-1.2/Makefile.linux	2015-10-17 01:39:51.839999256 +0000
-@@ -200,8 +200,8 @@
- 
- # Uncomment following lines to enable GPS interface & tracker function.
- 
--#CFLAGS += -DENABLE_GPS
--#LDLIBS += -lgps
-+CFLAGS += -DENABLE_GPS
-+LDLIBS += -lgps
- 
- 
- # Name of current directory.
-@@ -275,7 +275,7 @@
- 
- # This is a step in the right direction but not sufficient to use /usr instead.
- 
--INSTALLDIR := /usr/local
-+INSTALLDIR := /usr
- 
- 
- # direwolf.desktop was previously handcrafted for the Raspberry Pi.
-@@ -311,42 +311,42 @@
- 
- install : direwolf decode_aprs text2tt tt2text ll2utm utm2ll aclients log2gpx gen_packets \
- 		tocalls.txt symbols-new.txt symbolsX.txt dw-icon.png direwolf.desktop
--	install direwolf $(INSTALLDIR)/bin
--	install decode_aprs $(INSTALLDIR)/bin
--	install text2tt $(INSTALLDIR)/bin
--	install tt2text $(INSTALLDIR)/bin
--	install ll2utm $(INSTALLDIR)/bin
--	install utm2ll $(INSTALLDIR)/bin
--	install aclients $(INSTALLDIR)/bin
--	install log2gpx $(INSTALLDIR)/bin
--	install gen_packets $(INSTALLDIR)/bin
--	install atest $(INSTALLDIR)/bin
--	install ttcalc $(INSTALLDIR)/bin
--	install dwespeak.sh $(INSTALLDIR)/bin
--	install -D --mode=644 tocalls.txt /usr/share/direwolf/tocalls.txt
--	install -D --mode=644 symbols-new.txt /usr/share/direwolf/symbols-new.txt
--	install -D --mode=644 symbolsX.txt /usr/share/direwolf/symbolsX.txt
--	install -D --mode=644 dw-icon.png /usr/share/direwolf/dw-icon.png
--	install -D --mode=644 direwolf.desktop /usr/share/applications/direwolf.desktop
--	install -D --mode=644 CHANGES.txt $(INSTALLDIR)/share/doc/direwolf/CHANGES.txt
--	install -D --mode=644 LICENSE-dire-wolf.txt $(INSTALLDIR)/share/doc/direwolf/LICENSE-dire-wolf.txt
--	install -D --mode=644 LICENSE-other.txt $(INSTALLDIR)/share/doc/direwolf/LICENSE-other.txt
--	install -D --mode=644 User-Guide.pdf $(INSTALLDIR)/share/doc/direwolf/User-Guide.pdf
--	install -D --mode=644 Raspberry-Pi-APRS.pdf $(INSTALLDIR)/share/doc/direwolf/Raspberry-Pi-APRS.pdf
--	install -D --mode=644 Raspberry-Pi-APRS-Tracker.pdf $(INSTALLDIR)/share/doc/direwolf/Raspberry-Pi-APRS-Tracker.pdf
--	install -D --mode=644 APRStt-Implementation-Notes.pdf $(INSTALLDIR)/share/doc/direwolf/APRStt-Implementation-Notes.pdf
--	install -D --mode=644 A-Better-APRS-Packet-Demodulator-Part-1-1200-baud.pdf $(INSTALLDIR)/share/doc/direwolf/A-Better-APRS-Packet-Demodulator-Part-1-1200-baud.pdf
--	install -D --mode=644 A-Better-APRS-Packet-Demodulator-Part-2-9600-baud.pdf $(INSTALLDIR)/share/doc/direwolf/A-Better-APRS-Packet-Demodulator-Part-2-9600-baud.pdf
--	install -D --mode=644 man1/aclients.1 $(INSTALLDIR)/man/man1/aclients.1
--	install -D --mode=644 man1/atest.1 $(INSTALLDIR)/man/man1/atest.1
--	install -D --mode=644 man1/decode_aprs.1 $(INSTALLDIR)/man/man1/decode_aprs.1
--	install -D --mode=644 man1/direwolf.1 $(INSTALLDIR)/man/man1/direwolf.1
--	install -D --mode=644 man1/gen_packets.1 $(INSTALLDIR)/man/man1/gen_packets.1
--	install -D --mode=644 man1/ll2utm.1 $(INSTALLDIR)/man/man1/ll2utm.1
--	install -D --mode=644 man1/log2gpx.1 $(INSTALLDIR)/man/man1/log2gpx.1
--	install -D --mode=644 man1/text2tt.1 $(INSTALLDIR)/man/man1/text2tt.1
--	install -D --mode=644 man1/tt2text.1 $(INSTALLDIR)/man/man1/tt2text.1
--	install -D --mode=644 man1/utm2ll.1 $(INSTALLDIR)/man/man1/utm2ll.1
-+	install direwolf $(DESTDIR)$(INSTALLDIR)/bin
-+	install decode_aprs $(DESTDIR)$(INSTALLDIR)/bin
-+	install text2tt $(DESTDIR)$(INSTALLDIR)/bin
-+	install tt2text $(DESTDIR)$(INSTALLDIR)/bin
-+	install ll2utm $(DESTDIR)$(INSTALLDIR)/bin
-+	install utm2ll $(DESTDIR)$(INSTALLDIR)/bin
-+	install aclients $(DESTDIR)$(INSTALLDIR)/bin
-+	install log2gpx $(DESTDIR)$(INSTALLDIR)/bin
-+	install gen_packets $(DESTDIR)$(INSTALLDIR)/bin
-+	install atest $(DESTDIR)$(INSTALLDIR)/bin
-+	install ttcalc $(DESTDIR)$(INSTALLDIR)/bin
-+	install dwespeak.sh $(DESTDIR)$(INSTALLDIR)/bin
-+	install -D --mode=644 tocalls.txt $(DESTDIR)/usr/share/direwolf/tocalls.txt
-+	install -D --mode=644 symbols-new.txt $(DESTDIR)/usr/share/direwolf/symbols-new.txt
-+	install -D --mode=644 symbolsX.txt $(DESTDIR)/usr/share/direwolf/symbolsX.txt
-+	install -D --mode=644 dw-icon.png $(DESTDIR)/usr/share/direwolf/dw-icon.png
-+	install -D --mode=644 direwolf.desktop $(DESTDIR)/usr/share/applications/direwolf.desktop
-+	install -D --mode=644 CHANGES.txt $(DESTDIR)$(INSTALLDIR)/share/doc/direwolf/CHANGES.txt
-+	install -D --mode=644 LICENSE-dire-wolf.txt $(DESTDIR)$(INSTALLDIR)/share/licenses/direwolf/LICENSE-dire-wolf.txt
-+	install -D --mode=644 LICENSE-other.txt $(DESTDIR)$(INSTALLDIR)/share/licenses/direwolf/LICENSE-other.txt
-+	install -D --mode=644 User-Guide.pdf $(DESTDIR)$(INSTALLDIR)/share/doc/direwolf/User-Guide.pdf
-+	install -D --mode=644 Raspberry-Pi-APRS.pdf $(DESTDIR)$(INSTALLDIR)/share/doc/direwolf/Raspberry-Pi-APRS.pdf
-+	install -D --mode=644 Raspberry-Pi-APRS-Tracker.pdf $(DESTDIR)$(INSTALLDIR)/share/doc/direwolf/Raspberry-Pi-APRS-Tracker.pdf
-+	install -D --mode=644 APRStt-Implementation-Notes.pdf $(DESTDIR)$(INSTALLDIR)/share/doc/direwolf/APRStt-Implementation-Notes.pdf
-+	install -D --mode=644 A-Better-APRS-Packet-Demodulator-Part-1-1200-baud.pdf $(DESTDIR)$(INSTALLDIR)/share/doc/direwolf/A-Better-APRS-Packet-Demodulator-Part-1-1200-baud.pdf
-+	install -D --mode=644 A-Better-APRS-Packet-Demodulator-Part-2-9600-baud.pdf $(DESTDIR)$(INSTALLDIR)/share/doc/direwolf/A-Better-APRS-Packet-Demodulator-Part-2-9600-baud.pdf
-+	install -D --mode=644 man1/aclients.1 $(DESTDIR)$(INSTALLDIR)/share/man/man1/aclients.1
-+	install -D --mode=644 man1/atest.1 $(DESTDIR)$(INSTALLDIR)/share/man/man1/atest.1
-+	install -D --mode=644 man1/decode_aprs.1 $(DESTDIR)$(INSTALLDIR)/share/man/man1/decode_aprs.1
-+	install -D --mode=644 man1/direwolf.1 $(DESTDIR)$(INSTALLDIR)/share/man/man1/direwolf.1
-+	install -D --mode=644 man1/gen_packets.1 $(DESTDIR)$(INSTALLDIR)/share/man/man1/gen_packets.1
-+	install -D --mode=644 man1/ll2utm.1 $(DESTDIR)$(INSTALLDIR)/share/man/man1/ll2utm.1
-+	install -D --mode=644 man1/log2gpx.1 $(DESTDIR)$(INSTALLDIR)/share/man/man1/log2gpx.1
-+	install -D --mode=644 man1/text2tt.1 $(DESTDIR)$(INSTALLDIR)/share/man/man1/text2tt.1
-+	install -D --mode=644 man1/tt2text.1 $(DESTDIR)$(INSTALLDIR)/share/man/man1/tt2text.1
-+	install -D --mode=644 man1/utm2ll.1 $(DESTDIR)$(INSTALLDIR)/share/man/man1/utm2ll.1
- 	@echo " "
- 	@echo "If this is your first install, not an upgrade, type this"
- 	@echo "to put a copy of the sample configuration file in your home directory:"
+diff -Nurd direwolf-1.3.orig/Makefile.linux direwolf-1.3/Makefile.linux
+--- direwolf-1.3.orig/Makefile.linux	2016-05-03 00:08:29.000000000 +0000
++++ direwolf-1.3/Makefile.linux	2016-10-18 20:56:54.709562096 +0000
+@@ -490,11 +490,11 @@
+ #
+ # Misc. data such as "tocall" to system mapping.
+ #
+-	$(INSTALL) -D --mode=644 tocalls.txt /usr/share/direwolf/tocalls.txt
+-	$(INSTALL) -D --mode=644 symbols-new.txt /usr/share/direwolf/symbols-new.txt
+-	$(INSTALL) -D --mode=644 symbolsX.txt /usr/share/direwolf/symbolsX.txt
+-	$(INSTALL) -D --mode=644 dw-icon.png /usr/share/direwolf/dw-icon.png
+-	$(INSTALL) -D --mode=644 direwolf.desktop /usr/share/applications/direwolf.desktop
++	$(INSTALL) -D --mode=644 tocalls.txt $(INSTALLDIR)/share/direwolf/tocalls.txt
++	$(INSTALL) -D --mode=644 symbols-new.txt $(INSTALLDIR)/share/direwolf/symbols-new.txt
++	$(INSTALL) -D --mode=644 symbolsX.txt $(INSTALLDIR)/share/direwolf/symbolsX.txt
++	$(INSTALL) -D --mode=644 dw-icon.png $(INSTALLDIR)/share/direwolf/dw-icon.png
++	$(INSTALL) -D --mode=644 direwolf.desktop $(INSTALLDIR)/share/applications/direwolf.desktop
+ #
+ # Documentation.  Various plain text files and PDF.
+ #
diff --git a/PKGBUILD b/PKGBUILD
index ead2c05d0c3f..db7921932274 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Wijnand Modderman-Lenstra <maze@pyth0n.org>
 pkgname=direwolf
-pkgver=1.2
+pkgver=1.3
 pkgrel=1
 epoch=
 pkgdesc="Dire Wolf is a software modem/TNC and APRS encoder/decoder"
@@ -11,26 +11,24 @@ depends=('alsa-lib' 'gpsd')
 makedepends=('make' 'gcc' 'patch')
 source=("https://github.com/wb2osz/direwolf/archive/$pkgver.zip"
 	'Makefile.patch'
-	'gps.patch'
-	'kiss.patch'
         'direwolf.service'
         'direwolf-kiss.service')
-sha1sums=('4d543ad206a9643003836eb5ccd9bbbaf86ab560'
-          '878faf112044b24070c4c8480d89535e9c345b44'
-          '462d0cecb55daf230d2b59faac3822d00cf4b6fe'
-          '17d1fdf760b0929a0f1de8825623b63818603b43'
+sha1sums=('93201580ac2b8832bbcad2fca4438332710e4090'
+          'f94b193a8e49bae073de3cedff4394821d6148fa'
           '66366c7a4e8d3768013f9036f2681a86d4b8ad88'
           'eea3a3fb334645cd8a1e2604dc6c6b024148722a')
+sha256sums=('9a1a151b42d5e83d306d04d56353826447d62e6e56d7ef162db4d5be4a0c0a86'
+            '5a4bee3543da1bbe9cd8bd5edb3bb9b502728841c4c34da332a19f34f876a140'
+            'a1efe2bb96470bc52faa747708b195a685dc454f3d9c91f6bf4d39ab94d3608a'
+            '2a2e4acc769a20afebdfdcd21640fd17b0c4217ceb7ecb3378f9ee5c45fadc68')
 
 prepare() {
 	cd "$pkgname-$pkgver"
+	patch -p1 < ../Makefile.patch
 }
 
 build() {
 	cd "$pkgname-$pkgver"
-	patch -p1 < ../Makefile.patch
-	patch -p1 < ../gps.patch
-	patch -p1 < ../kiss.patch
 	make
 }
 
@@ -43,7 +41,7 @@ package() {
 	mkdir -p "$pkgdir/usr/bin"
 	mkdir -p "$pkgdir/usr/share/doc/$pkgname"
 	mkdir -p "$pkgdir/var/log/direwolf"
-	make DESTDIR="$pkgdir/" install
+	make INSTALLDIR="$pkgdir/usr" install
 
 	mkdir -p "$pkgdir/etc/direwolf"
 	install -D -m 644 direwolf.conf "$pkgdir/etc/direwolf/direwolf.conf"
diff --git a/gps.patch b/gps.patch
deleted file mode 100644
index 476ba0848f71..000000000000
--- a/gps.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur direwolf-1.2.org/dwgps.c direwolf-1.2/dwgps.c
---- direwolf-1.2.org/dwgps.c	2015-07-27 01:17:23.000000000 +0000
-+++ direwolf-1.2/dwgps.c	2015-10-17 01:34:56.099999369 +0000
-@@ -60,7 +60,7 @@
- #if ENABLE_GPS
- #include <gps.h>
- 
--#if GPSD_API_MAJOR_VERSION != 5
-+#if GPSD_API_MAJOR_VERSION != 6
- #error libgps API version might be incompatible.
- #endif
- 
diff --git a/kiss.patch b/kiss.patch
deleted file mode 100644
index 3a0619033600..000000000000
--- a/kiss.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur direwolf-1.2.org/kiss.c direwolf-1.2/kiss.c
---- direwolf-1.2.org/kiss.c	2015-07-27 01:17:23.000000000 +0000
-+++ direwolf-1.2/kiss.c	2015-10-17 01:48:10.499999066 +0000
-@@ -177,7 +177,7 @@
-  * Symlink to pseudo terminal name which changes.
-  */
- 
--#define TMP_KISSTNC_SYMLINK "/tmp/kisstnc"
-+#define TMP_KISSTNC_SYMLINK "/run/direwolf.sock"
- 
- #endif
-
author	maze	2016-10-18 20:59:18 +0000
committer	maze	2016-10-18 20:59:18 +0000
commit	fce751252439bf541db22f5a02658151854bd3e8 (patch)
tree	eab3f842e54f35fff87b090ecb06b576d4902b50
parent	5e8db55e67f4b44e67b31fb10faae8ef9a8d39a5 (diff)
download	aur-fce751252439bf541db22f5a02658151854bd3e8.tar.gz