From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Tremer To: development@lists.ipfire.org Subject: Re: [PATCH 5/6] apcupsd: update to 3.14.14 Date: Sun, 12 Mar 2017 16:08:55 +0000 Message-ID: <1489334935.10391.82.camel@ipfire.org> In-Reply-To: <1489334698.10391.79.camel@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============5573703567020335238==" List-Id: --===============5573703567020335238== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable It builds, so I merged it for c110. On Sun, 2017-03-12 at 16:04 +0000, Michael Tremer wrote: > Is this patch actually supposed to be in this patchset? >=20 > On Sun, 2016-11-13 at 20:23 +0100, Marcel Lorenz wrote: > >=20 > > Signed-off-by: Marcel Lorenz > > --- > > =C2=A0lfs/apcupsd | 8 ++++---- > > =C2=A01 file changed, 4 insertions(+), 4 deletions(-) > >=20 > > diff --git a/lfs/apcupsd b/lfs/apcupsd > > index 4e9137b..3e2ba20 100644 > > --- a/lfs/apcupsd > > +++ b/lfs/apcupsd > > @@ -1,7 +1,7 @@ > > =C2=A0###################################################################= ######## > > ## > > ## > > =C2=A0#=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 > > =C2=A0=C2=A0 > > =C2=A0# > > =C2=A0# IPFire.org - A linux based > > firewall=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0# > > -# Copyright (C) 2007-2012=C2=A0=C2=A0IPFire Team=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 > > =C2=A0=C2=A0 > > =C2=A0# > > +# Copyright (C) 2007-2016=C2=A0=C2=A0IPFire Team=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 > > =C2=A0=C2=A0 > > =C2=A0# > > =C2=A0#=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 > > =C2=A0=C2=A0 > > =C2=A0# > > =C2=A0# This program is free software: you can redistribute it and/or > > modify=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0# > > =C2=A0# it under the terms of the GNU General Public License as published > > by=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0# > > @@ -24,7 +24,7 @@ > > =C2=A0 > > =C2=A0include Config > > =C2=A0 > > -VER=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=3D 3.14.10 > > +VER=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=3D 3.14.14 > > =C2=A0 > > =C2=A0THISAPP=C2=A0=C2=A0=C2=A0=C2=A0=3D apcupsd-$(VER) > > =C2=A0DL_FILE=C2=A0=C2=A0=C2=A0=C2=A0=3D $(THISAPP).tar.gz > > @@ -32,7 +32,7 @@ DL_FROM=C2=A0=C2=A0=C2=A0=C2=A0=3D $(URL_IPFIRE) > > =C2=A0DIR_APP=C2=A0=C2=A0=C2=A0=C2=A0=3D $(DIR_SRC)/$(THISAPP) > > =C2=A0TARGET=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=3D $(DIR_INFO)/$(THISAPP) > > =C2=A0PROG=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=3D apcupsd > > -PAK_VER=C2=A0=C2=A0=C2=A0=C2=A0=3D 5 > > +PAK_VER=C2=A0=C2=A0=C2=A0=C2=A0=3D 6 > > =C2=A0 > > =C2=A0DEPS=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=3D "" > > =C2=A0 > > @@ -44,7 +44,7 @@ objects =3D $(DL_FILE) > > =C2=A0 > > =C2=A0$(DL_FILE) =3D $(DL_FROM)/$(DL_FILE) > > =C2=A0 > > -$(DL_FILE)_MD5 =3D 5928822d855c5cf7ac29655e3e0b8c23 > > +$(DL_FILE)_MD5 =3D cc8f5ced77f38906a274787acb9bc980 > > =C2=A0 > > =C2=A0install : $(TARGET) > > =C2=A0 --===============5573703567020335238== Content-Type: application/pgp-signature Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="signature.asc" MIME-Version: 1.0 LS0tLS1CRUdJTiBQR1AgU0lHTkFUVVJFLS0tLS0KVmVyc2lvbjogR251UEcgdjIKCmlRSWNCQUFC Q2dBR0JRSll4WEtYQUFvSkVJQjU4UDl2a0FrSHc0WVFBSktDdXpta0Y3SXp4SDFrK296NVhTenYK RWxNSjZhRStDWnBqQ2NZaHh2WjhRQ1dnNGFaZ0FkcE10Z3lobG9iZEU0REN1ejRoRk5iangxQzFQ MFBWVmduVgpKcjNiOGlLVVg1UFQ5QmdjS1dYYUdtb05CTGVBYzRXZC9ZWCtJSGF3bm90RVRNcTdC c1FwbG96WmVOcnBESU05Clp1QStzaHMzai9aL3JXM2dDVkp4TDhYK0hsQjcycEtqZDcwTVlWU2Iw NGdkWGNqNDdTUnppUSttUlNiL0JNdWUKV29xQ09sN1hLUnd5QlNPK0JXMXhZVEZQYW51SGlrNmx1 OTlvWUovK0gwbXh2d08zUFVOVGdyc0VzejFvbVBESgphNXZTQndqYUUwRFpSVHczTjlPUER3aTho NFVMM3N5OGFuWTNEL3V2ZjRVeG1UNW8rK2h3RVJjNFptWmlRYVozCk5pMzBqK0ZZZmVJMzQ2RnEz QlpCU0RHb3hvQU95QUpMKzhrNE5Ic0NoKy9OQi9UclpOdng5VDJTMENsTkJXUWYKVmM4eUY0MEVz RXJadzJLRFVqVWdyNUxvckg0UlE0ZVpxWmFqcDVIYTVuVm9KcFVoVXNnWFFtWFNQa0NtZ0Qydwpz TXlhZ1R2Tlc2eG9Mb3hrQ3NiVElieE02WFN0dHo0QUZWc2RKdFRXb1EvQXdwZ0I1TEZlT0E2Z2RY emVqRVhpCmJERURoUXZrVVZEcFEvQnlUcFJUQk5YUjJJd0RCU2tHUXBSTys5WFhLalpycEFIaC9J bU0waDZoUENCOEJJZVUKZCtjZjBCOWZhRW12a29lSVhuWXZzOFJjejNLcHM4ZWZwald6VjR0ZFhy Ym5nMWRVTkxWdTdidCsyNHBNc3FkWApRR0NsTmlwN1Q2aDl5NjIzT3BtVQo9OFJZMQotLS0tLUVO RCBQR1AgU0lHTkFUVVJFLS0tLS0K --===============5573703567020335238==--