X-Original-To: alpine-aports@mail.alpinelinux.org Delivered-To: alpine-aports@mail.alpinelinux.org Received: from mail.alpinelinux.org (dallas-a1.alpinelinux.org [127.0.0.1]) by mail.alpinelinux.org (Postfix) with ESMTP id 7FC19DD571D for ; Sat, 31 Oct 2015 03:05:52 +0000 (UTC) Received: from newmail.tetrasec.net (unknown [74.117.189.116]) by mail.alpinelinux.org (Postfix) with ESMTP id 53280DD571C for ; Sat, 31 Oct 2015 03:05:52 +0000 (UTC) Received: from sparky_64.resnet.local (fw.spencertelecom.com [74.117.189.85]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: nangel@tetrasec.net) by newmail.tetrasec.net (Postfix) with ESMTPSA id 065065A1459; Sat, 31 Oct 2015 02:55:19 +0000 (GMT) From: Nathan Angelacos To: alpine-aports@lists.alpinelinux.org Cc: Nathan Angelacos Subject: [alpine-aports] [PATCH] main/gpsd bump version to 3.15 Date: Sat, 31 Oct 2015 03:05:41 +0000 Message-Id: <1446260741-13233-1-git-send-email-nangel@alpinelinux.org> X-Mailer: git-send-email 2.6.1 X-Virus-Scanned: ClamAV using ClamSMTP X-Mailinglist: alpine-aports Precedence: list List-Id: Alpine Development List-Unsubscribe: List-Post: List-Help: List-Subscribe: --- main/gpsd/APKBUILD | 24 ++++++++++++------------ main/gpsd/gpsd-use-local-timepps-header.patch | 10 ++++++---- main/gpsd/gpsd.initd | 2 ++ main/gpsd/ttydefaults.patch | 8 +++++--- 4 files changed, 25 insertions(+), 19 deletions(-) diff --git a/main/gpsd/APKBUILD b/main/gpsd/APKBUILD index 1e64db0..9aeb63d 100644 --- a/main/gpsd/APKBUILD +++ b/main/gpsd/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Nathan Angelacos # Maintainer: Nathan Angelacos pkgname=gpsd -pkgver=3.13 -pkgrel=1 +pkgver=3.15 +pkgrel=0 pkgdesc="A GPS daemon" arch=all url="http://catb.org/gpsd/" @@ -42,7 +42,7 @@ prepare() { build() { cd "$_builddir" - CPPFLAGS="-I." + CPPFLAGS="-I. -DHAVE_SYS_TIMEPPS_H" scons -j1 \ prefix=/usr \ || return 1 @@ -63,21 +63,21 @@ package() { install -m644 -D "$srcdir"/gpsd.confd "$pkgdir"/etc/conf.d/gpsd } -md5sums="558dce98edaaccc8d41043adb52fbe68 gpsd-3.13.tar.gz +md5sums="afd79b87337fadf38ee2a7c4314dac79 gpsd-3.15.tar.gz 28f6835098a216f4a620f9218d15b5b8 timepps.h -cda9687cebd7129d516133f737034af9 gpsd-use-local-timepps-header.patch -2dec132fa33b247b05831311b6576ce1 ttydefaults.patch +940780c04830eb08ae29276da1de8925 gpsd-use-local-timepps-header.patch +5189a0776250acda819286e1336ac8c6 ttydefaults.patch f71757d6ebaeb20d9d0d02df7b0a3387 gpsd.initd 453f3d1d75d2b048f0987cfb9cf250fd gpsd.confd" -sha256sums="d30bbe31ef9f89d2c281197c64204bcff255883462318250f913444ae00874c1 gpsd-3.13.tar.gz +sha256sums="81c89e271ae112313e68655ab30d227bc38fe7841ffbff0f1860b12a9d7696ea gpsd-3.15.tar.gz ab4f459ee9d1037d7fa962a66ea652b08935539a4f443dc216e82b5717d8bb22 timepps.h -235a341f611a0021f97c6e0afbd18be80e9413c386febc8b55c3e70683456be4 gpsd-use-local-timepps-header.patch -3cf69b07b9c4d6e2fccfbcdf2510729dd0882767e091b7ad05f901aef2e49ede ttydefaults.patch +4857faaf2d0f69b5b91c32f1813ffd01c435677e73aab2ff8125c373cdc9c048 gpsd-use-local-timepps-header.patch +d42d323425eae828d5685b058a81ff1bb6e82ab695ea3e80c2fff18f0c8cc302 ttydefaults.patch b51ce133b58dfdab5f81ea1681c6d314d9c4b365b9bf05bd92be404a54c7c2f3 gpsd.initd 218a7f044f902070922c45f3b543c9ff6af25be5305648899565c1fbdc0d5da9 gpsd.confd" -sha512sums="339e752ae6a06272082e8a4f97915001aeee4deecd956ace1be862f9e3734b7663407c4a6a41ac00e7de195771da55fb26b93ec152abd8251a0d7a13cb8ad51e gpsd-3.13.tar.gz +sha512sums="2be83cac52b5034bca44374cf7e17917270fe50495014f424d46a171bc77b58f9c5eb8ea38fe0cff9a28a6c2b6b8e5bf17a5a141eb9243962319a1ae9da2ea04 gpsd-3.15.tar.gz eb11fc19243d1789016d88eb7645bfe67c46304547781489bf36eb1dd4c252d523681ff835a6488fa0ef62b6b9e2f781c672279f4439f5d5640a3f214a113048 timepps.h -bbe89344821fd86c87372acbb96f872571ce51087fa2cc3f388177ac2e64b3e8597c680c3a087728c5bf9e5052ec821b5500698aadab046e4ec3b36ebc7756de gpsd-use-local-timepps-header.patch -f73eb65bb053ac3a84f9bc0aafafb472a98ae5ff5d706c61fd82e95f15eb04fd842f5feb10e66d3ba8b3fe6c5baedc98779ed20719cb5e414be303ad71b79ca3 ttydefaults.patch +1802e72c9ac71a162fcd37d99dc9c8596b6085180dba9b37f24f2b17344d16cd5f618228f43bfdc2f7509f9a2f1072c2b11c238486febcdb94d9d0d095eaebdd gpsd-use-local-timepps-header.patch +e2af8f52fc2d7e663882b6d12c5f4d709aa267b16eb9aeca2a70d8ecc681ae72359f3efcd1636cde576bc8579e008f242574bc0adfab7252d3e763f039e86135 ttydefaults.patch 114133e9ed5ad937a8ec916c2f9c842bb1e2161c9351b415a4decdb18785736cddce97a70603ab9402d28065612fffd0b8b4ecb90e8e1660661dc1d2bcb213bf gpsd.initd 55d4a51f82d445d3ac93b2855132ef4380908ed045feba6298ed1d0b607cd9054b5325c024dc52b370983ebd5d9b377537aee7d7128c97aa22e3075f4134d404 gpsd.confd" diff --git a/main/gpsd/gpsd-use-local-timepps-header.patch b/main/gpsd/gpsd-use-local-timepps-header.patch index 46c491d..4724e43 100644 --- a/main/gpsd/gpsd-use-local-timepps-header.patch +++ b/main/gpsd/gpsd-use-local-timepps-header.patch @@ -1,11 +1,13 @@ ---- ./gpsd.h-tail.orig -+++ ./gpsd.h-tail -@@ -38,7 +38,7 @@ +diff --git a/ppsthread.c b/ppsthread.c +index 5fae444..d09957b 100644 +--- a/ppsthread.c ++++ b/ppsthread.c +@@ -72,7 +72,7 @@ // 'close' is not defined otherwise. #include #include -#include +#include "sys/timepps.h" - #endif /* S_SPLINT_S */ #endif + #include "timespec.h" diff --git a/main/gpsd/gpsd.initd b/main/gpsd/gpsd.initd index fc6fd7f..ea7f2ad 100644 --- a/main/gpsd/gpsd.initd +++ b/main/gpsd/gpsd.initd @@ -1,6 +1,8 @@ #!/sbin/openrc-run # Copyright 2012 Nathan Angelacos +description="GPS daemon" + depend() { need net after firewall diff --git a/main/gpsd/ttydefaults.patch b/main/gpsd/ttydefaults.patch index f72ca3d..2d0e171 100644 --- a/main/gpsd/ttydefaults.patch +++ b/main/gpsd/ttydefaults.patch @@ -1,5 +1,7 @@ ---- ./gpsmon.c.orig -+++ ./gpsmon.c +diff --git a/gpsmon.c b/gpsmon.c +index c3001c8..965ea98 100644 +--- a/gpsmon.c ++++ b/gpsmon.c @@ -19,6 +19,7 @@ #include /* expected to declare select(2) a la SuS */ #include @@ -7,4 +9,4 @@ +#include #include #include - #ifndef S_SPLINT_S + #include -- 2.6.1 --- Unsubscribe: alpine-aports+unsubscribe@lists.alpinelinux.org Help: alpine-aports+help@lists.alpinelinux.org ---