[5/6] apcupsd: update to 3.14.14
Message ID | 20161113192400.19514-6-marcel.lorenz@ipfire.org |
---|---|
State | Accepted |
Commit | 373c0c7bed5f24762285ce0e31858a2bc79bcdc8 |
Headers |
Return-Path: <development-bounces@lists.ipfire.org> Received: from mail01.ipfire.org (unknown [172.28.1.200]) by web02.ipfire.org (Postfix) with ESMTP id DDF9660F7A for <patchwork@ipfire.org>; Sun, 13 Nov 2016 20:20:49 +0100 (CET) Received: from mail01.ipfire.org (localhost [IPv6:::1]) by mail01.ipfire.org (Postfix) with ESMTP id 2654648B3; Sun, 13 Nov 2016 20:20:31 +0100 (CET) Received: from localhost.localdomain (ip5f5b7cdb.dynamic.kabel-deutschland.de [95.91.124.219]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id DE35348AE for <development@lists.ipfire.org>; Sun, 13 Nov 2016 20:20:20 +0100 (CET) From: Marcel Lorenz <marcel.lorenz@ipfire.org> To: development@lists.ipfire.org Subject: [PATCH 5/6] apcupsd: update to 3.14.14 Date: Sun, 13 Nov 2016 20:23:59 +0100 Message-Id: <20161113192400.19514-6-marcel.lorenz@ipfire.org> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20161113192400.19514-1-marcel.lorenz@ipfire.org> References: <20161113192400.19514-1-marcel.lorenz@ipfire.org> X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: IPFire development talk <development.lists.ipfire.org> List-Unsubscribe: <http://lists.ipfire.org/mailman/options/development>, <mailto:development-request@lists.ipfire.org?subject=unsubscribe> List-Archive: <http://lists.ipfire.org/pipermail/development/> List-Post: <mailto:development@lists.ipfire.org> List-Help: <mailto:development-request@lists.ipfire.org?subject=help> List-Subscribe: <http://lists.ipfire.org/mailman/listinfo/development>, <mailto:development-request@lists.ipfire.org?subject=subscribe> Errors-To: development-bounces@lists.ipfire.org Sender: "Development" <development-bounces@lists.ipfire.org> |
Message
Marcel Lorenz
Nov. 14, 2016, 6:23 a.m. UTC
Signed-off-by: Marcel Lorenz <marcel.lorenz@ipfire.org>
---
lfs/apcupsd | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
Comments
Is this patch actually supposed to be in this patchset? On Sun, 2016-11-13 at 20:23 +0100, Marcel Lorenz wrote: > Signed-off-by: Marcel Lorenz <marcel.lorenz@ipfire.org> > --- > lfs/apcupsd | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/lfs/apcupsd b/lfs/apcupsd > index 4e9137b..3e2ba20 100644 > --- a/lfs/apcupsd > +++ b/lfs/apcupsd > @@ -1,7 +1,7 @@ > ############################################################################# > ## > # > # > # IPFire.org - A linux based > firewall # > -# Copyright (C) 2007-2012 IPFire Team <info@ipfire.org> > # > +# Copyright (C) 2007-2016 IPFire Team <info@ipfire.org> > # > # > # > # This program is free software: you can redistribute it and/or > modify # > # it under the terms of the GNU General Public License as published > by # > @@ -24,7 +24,7 @@ > > include Config > > -VER = 3.14.10 > +VER = 3.14.14 > > THISAPP = apcupsd-$(VER) > DL_FILE = $(THISAPP).tar.gz > @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) > DIR_APP = $(DIR_SRC)/$(THISAPP) > TARGET = $(DIR_INFO)/$(THISAPP) > PROG = apcupsd > -PAK_VER = 5 > +PAK_VER = 6 > > DEPS = "" > > @@ -44,7 +44,7 @@ objects = $(DL_FILE) > > $(DL_FILE) = $(DL_FROM)/$(DL_FILE) > > -$(DL_FILE)_MD5 = 5928822d855c5cf7ac29655e3e0b8c23 > +$(DL_FILE)_MD5 = cc8f5ced77f38906a274787acb9bc980 > > install : $(TARGET) >
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? > > On Sun, 2016-11-13 at 20:23 +0100, Marcel Lorenz wrote: > > > > Signed-off-by: Marcel Lorenz <marcel.lorenz@ipfire.org> > > --- > > lfs/apcupsd | 8 ++++---- > > 1 file changed, 4 insertions(+), 4 deletions(-) > > > > diff --git a/lfs/apcupsd b/lfs/apcupsd > > index 4e9137b..3e2ba20 100644 > > --- a/lfs/apcupsd > > +++ b/lfs/apcupsd > > @@ -1,7 +1,7 @@ > > ########################################################################### > > ## > > ## > > # > > > > # > > # IPFire.org - A linux based > > firewall # > > -# Copyright (C) 2007-2012 IPFire Team <info@ipfire.org> > > > > # > > +# Copyright (C) 2007-2016 IPFire Team <info@ipfire.org> > > > > # > > # > > > > # > > # This program is free software: you can redistribute it and/or > > modify # > > # it under the terms of the GNU General Public License as published > > by # > > @@ -24,7 +24,7 @@ > > > > include Config > > > > -VER = 3.14.10 > > +VER = 3.14.14 > > > > THISAPP = apcupsd-$(VER) > > DL_FILE = $(THISAPP).tar.gz > > @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) > > DIR_APP = $(DIR_SRC)/$(THISAPP) > > TARGET = $(DIR_INFO)/$(THISAPP) > > PROG = apcupsd > > -PAK_VER = 5 > > +PAK_VER = 6 > > > > DEPS = "" > > > > @@ -44,7 +44,7 @@ objects = $(DL_FILE) > > > > $(DL_FILE) = $(DL_FROM)/$(DL_FILE) > > > > -$(DL_FILE)_MD5 = 5928822d855c5cf7ac29655e3e0b8c23 > > +$(DL_FILE)_MD5 = cc8f5ced77f38906a274787acb9bc980 > > > > install : $(TARGET) > >
The old version fails build after update ffmpeg and his dependencies, but I do not know exactly... Am 2017-03-12 17:04, schrieb Michael Tremer: > Is this patch actually supposed to be in this patchset? > > On Sun, 2016-11-13 at 20:23 +0100, Marcel Lorenz wrote: >> Signed-off-by: Marcel Lorenz <marcel.lorenz@ipfire.org> >> --- >> lfs/apcupsd | 8 ++++---- >> 1 file changed, 4 insertions(+), 4 deletions(-) >> >> diff --git a/lfs/apcupsd b/lfs/apcupsd >> index 4e9137b..3e2ba20 100644 >> --- a/lfs/apcupsd >> +++ b/lfs/apcupsd >> @@ -1,7 +1,7 @@ >> ############################################################################# >> ## >> # >> # >> # IPFire.org - A linux based >> firewall # >> -# Copyright (C) 2007-2012 IPFire >> Team <info@ipfire.org> >> # >> +# Copyright (C) 2007-2016 IPFire >> Team <info@ipfire.org> >> # >> # >> # >> # This program is free software: you can redistribute it and/or >> modify # >> # it under the terms of the GNU General Public License as published >> by # >> @@ -24,7 +24,7 @@ >> >> include Config >> >> -VER = 3.14.10 >> +VER = 3.14.14 >> >> THISAPP = apcupsd-$(VER) >> DL_FILE = $(THISAPP).tar.gz >> @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) >> DIR_APP = $(DIR_SRC)/$(THISAPP) >> TARGET = $(DIR_INFO)/$(THISAPP) >> PROG = apcupsd >> -PAK_VER = 5 >> +PAK_VER = 6 >> >> DEPS = "" >> >> @@ -44,7 +44,7 @@ objects = $(DL_FILE) >> >> $(DL_FILE) = $(DL_FROM)/$(DL_FILE) >> >> -$(DL_FILE)_MD5 = 5928822d855c5cf7ac29655e3e0b8c23 >> +$(DL_FILE)_MD5 = cc8f5ced77f38906a274787acb9bc980 >> >> install : $(TARGET) >>
It built in the i586 and x86_64 nightly builds. So it's fine. On Mon, 2017-03-13 at 14:15 +0100, Marcel Lorenz wrote: > The old version fails build after update ffmpeg and his dependencies, > but I do not know exactly... > > Am 2017-03-12 17:04, schrieb Michael Tremer: > > > > Is this patch actually supposed to be in this patchset? > > > > On Sun, 2016-11-13 at 20:23 +0100, Marcel Lorenz wrote: > > > > > > Signed-off-by: Marcel Lorenz <marcel.lorenz@ipfire.org> > > > --- > > > lfs/apcupsd | 8 ++++---- > > > 1 file changed, 4 insertions(+), 4 deletions(-) > > > > > > diff --git a/lfs/apcupsd b/lfs/apcupsd > > > index 4e9137b..3e2ba20 100644 > > > --- a/lfs/apcupsd > > > +++ b/lfs/apcupsd > > > @@ -1,7 +1,7 @@ > > > ######################################################################### > > > #### > > > ## > > > # > > > > > > # > > > # IPFire.org - A linux based > > > firewall # > > > -# Copyright (C) 2007-2012 IPFire > > > Team <info@ipfire.org> > > > # > > > +# Copyright (C) 2007-2016 IPFire > > > Team <info@ipfire.org> > > > # > > > # > > > > > > # > > > # This program is free software: you can redistribute it and/or > > > modify # > > > # it under the terms of the GNU General Public License as published > > > by # > > > @@ -24,7 +24,7 @@ > > > > > > include Config > > > > > > -VER = 3.14.10 > > > +VER = 3.14.14 > > > > > > THISAPP = apcupsd-$(VER) > > > DL_FILE = $(THISAPP).tar.gz > > > @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) > > > DIR_APP = $(DIR_SRC)/$(THISAPP) > > > TARGET = $(DIR_INFO)/$(THISAPP) > > > PROG = apcupsd > > > -PAK_VER = 5 > > > +PAK_VER = 6 > > > > > > DEPS = "" > > > > > > @@ -44,7 +44,7 @@ objects = $(DL_FILE) > > > > > > $(DL_FILE) = $(DL_FROM)/$(DL_FILE) > > > > > > -$(DL_FILE)_MD5 = 5928822d855c5cf7ac29655e3e0b8c23 > > > +$(DL_FILE)_MD5 = cc8f5ced77f38906a274787acb9bc980 > > > > > > install : $(TARGET) > > > >