| Message ID | 20180202214649.26181-1-mbatranch@gmail.com |
|---|---|
| State | Dropped |
| 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 7CD7960157 for <patchwork@ipfire.org>; Fri, 2 Feb 2018 22:47:14 +0100 (CET) Received: from mail01.ipfire.org (localhost [IPv6:::1]) by mail01.ipfire.org (Postfix) with ESMTP id A3F1D46F5; Fri, 2 Feb 2018 22:47:13 +0100 (CET) Received: from mail-it0-x231.google.com (mail-it0-x231.google.com [IPv6:2607:f8b0:4001:c0b::231]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 0962046F2 for <development@lists.ipfire.org>; Fri, 2 Feb 2018 22:47:09 +0100 (CET) Received: by mail-it0-x231.google.com with SMTP id n206so9546986itg.1 for <development@lists.ipfire.org>; Fri, 02 Feb 2018 13:47:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=tdA5RejfS+3IAxx5Jth6yaBEwhmmyla7i4FYIYHf0rg=; b=CChhEG/d/vwgJ0TBkY1wIF4VhkyvenG6Di6xVjrHrp38umO+e4Fu07/pG9pxIglv3J uDBdfDY4NwfWiyyWnpw0gILrz5Tdz2lz5zS2/uJhix1MlC9CclkpvxYpJGpMZP1+l38s YYEDd+9gk3PDEdJY4zJuG11NtbJE055fdad53WS5wr8VL074kyVmr1evYH5TgTiEvboX 7r/1uqTykx7ypde1tdXhkYCm8KnQtNhplOGukP8AV1f52qBg6J3bPS1aI5WQgT2SGow/ RcpHU7c3+uO/hmXJdr7PFq9y+re182AH4IFZvSk2Y3g/Qo+SBIIQ71xXwTYaMGG9ZGhz ifjw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=tdA5RejfS+3IAxx5Jth6yaBEwhmmyla7i4FYIYHf0rg=; b=gT7mHfXuXHfaNb9Nrso/gwqIr0SnIkdHMIqysPVDykp7/NZeIUT859QPoPWPaRMq4e f4k0SYDfra6TrpL9/9t2aNslRJlUVzdnC8NgwEeaLTpoD2EfHOm4EM7Adu2Xs+BwMzvi Jf7a+QZJ9Yn/q2EVH2Td8vjkLpT7v/Bb9S5NL/sgYYTlRgEAI2ZcabDYnJXm1vEHWef2 OSHuyQhXv3ixHhb6u6ST8HMyJu6UPC9B/KjqmRJ5tDml/ZDST/NEMRWnK5wvswlCWnxY NXpmx2BFl4xizR5qjmWyNZVoLJkMnoLQroCv4jBauHV1jXeLX7YFxI66jLrYtKSWartq JeKg== X-Gm-Message-State: APf1xPCbcNINBzO9uRBq7rUVvtok2nMdSmwpn3aTsoM9iP9szAwuLIas mmHVXgGQPU7NTkDJvl+mgvwEMQ== X-Google-Smtp-Source: AH8x224oAPVDwwsuexo20vsFkVzRRaHhOnwsECAhBqvIjM7oXPdWbjhrOLRO3wlDRhVVPJs3JAwlYQ== X-Received: by 10.36.44.194 with SMTP id i185mr409469iti.37.1517608028095; Fri, 02 Feb 2018 13:47:08 -0800 (PST) Received: from karl.localdomain ([2001:5b0:41c5:3278:8b8a:fa49:c57:ba33]) by smtp.gmail.com with ESMTPSA id s8sm1628711itb.39.2018.02.02.13.47.04 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 02 Feb 2018 13:47:07 -0800 (PST) From: "Paul T. Simmons" <mbatranch@gmail.com> To: development@lists.ipfire.org Subject: [PATCH] Update: nut to 2.7.4 Date: Fri, 2 Feb 2018 15:46:49 -0600 Message-Id: <20180202214649.26181-1-mbatranch@gmail.com> X-Mailer: git-send-email 2.14.3 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: IPFire development talk <development.lists.ipfire.org> List-Unsubscribe: <https://lists.ipfire.org/mailman/options/development>, <mailto:development-request@lists.ipfire.org?subject=unsubscribe> List-Archive: <https://lists.ipfire.org/pipermail/development/> List-Post: <mailto:development@lists.ipfire.org> List-Help: <mailto:development-request@lists.ipfire.org?subject=help> List-Subscribe: <https://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> |
| Series |
Update: nut to 2.7.4
|
|
Commit Message
Paul Simmons
Feb. 3, 2018, 8:46 a.m. UTC
--- config/rootfiles/packages/nut | 2 +- lfs/nut | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-)
Comments
Hey, thanks for submitting this. I changed the URL back to our download server so that we will be able to download the source at any time, but apart from this, this is find with me. Merged. Best, -Michael On Fri, 2018-02-02 at 15:46 -0600, Paul T. Simmons wrote: > --- > config/rootfiles/packages/nut | 2 +- > lfs/nut | 10 +++++----- > 2 files changed, 6 insertions(+), 6 deletions(-) > > diff --git a/config/rootfiles/packages/nut b/config/rootfiles/packages/nut > index 4e6167e0d..b01381d74 100644 > --- a/config/rootfiles/packages/nut > +++ b/config/rootfiles/packages/nut > @@ -5,7 +5,7 @@ etc/nut/upsd.conf.sample > etc/nut/upsd.users.sample > etc/nut/upsmon.conf.sample > etc/nut/upssched.conf.sample > -etc/udev/rules.d/52-nut-usbups.rules > +etc/udev/rules.d/62-nut-usbups.rules > usr/bin/al175 > usr/bin/apcsmart > usr/bin/apcsmart-old > diff --git a/lfs/nut b/lfs/nut > index 2045dce6c..c2cb6e973 100644 > --- a/lfs/nut > +++ b/lfs/nut > @@ -24,15 +24,15 @@ > > include Config > > -VER = 2.7.2 > +VER = 2.7.4 > > THISAPP = nut-$(VER) > DL_FILE = $(THISAPP).tar.gz > -DL_FROM = $(URL_IPFIRE) > +DL_FROM = http://www.networkupstools.org/source/2.7 > DIR_APP = $(DIR_SRC)/$(THISAPP) > TARGET = $(DIR_INFO)/$(THISAPP) > PROG = nut > -PAK_VER = 5 > +PAK_VER = 6 > > DEPS = "" > > @@ -44,7 +44,7 @@ objects = $(DL_FILE) > > $(DL_FILE) = $(DL_FROM)/$(DL_FILE) > > -$(DL_FILE)_MD5 = c3568b42e058cfc385b46d25140dced4 > +$(DL_FILE)_MD5 = 3ba53656933d7471f95140b32a5b8d5c > > install : $(TARGET) > > @@ -83,7 +83,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) > cd $(DIR_APP) && make > cd $(DIR_APP) && make install > # sed -i -e "s|ATTR{|SYSFS{|g" /etc/udev/rules.d/52-nut-usbups.rules > - -mkdir -p /var/state/ups > + mkdir -p /var/state/ups > > #install initscripts > $(call INSTALL_INITSCRIPT,nut)
On Tue, 2018-02-06 at 00:37 +0000, Michael Tremer wrote: > Hey, > > thanks for submitting this. > > I changed the URL back to our download server so that we will be able > to > download the source at any time, but apart from this, this is find > with me. > > Merged. > > Best, > -Michael > > On Fri, 2018-02-02 at 15:46 -0600, Paul T. Simmons wrote: > > --- > > config/rootfiles/packages/nut | 2 +- > > lfs/nut | 10 +++++----- > > 2 files changed, 6 insertions(+), 6 deletions(-) > > > > diff --git a/config/rootfiles/packages/nut > > b/config/rootfiles/packages/nut > > index 4e6167e0d..b01381d74 100644 > > --- a/config/rootfiles/packages/nut > > +++ b/config/rootfiles/packages/nut > > @@ -5,7 +5,7 @@ etc/nut/upsd.conf.sample > > etc/nut/upsd.users.sample > > etc/nut/upsmon.conf.sample > > etc/nut/upssched.conf.sample > > -etc/udev/rules.d/52-nut-usbups.rules > > +etc/udev/rules.d/62-nut-usbups.rules > > usr/bin/al175 > > usr/bin/apcsmart > > usr/bin/apcsmart-old > > diff --git a/lfs/nut b/lfs/nut > > index 2045dce6c..c2cb6e973 100644 > > --- a/lfs/nut > > +++ b/lfs/nut > > @@ -24,15 +24,15 @@ > > > > include Config > > > > -VER = 2.7.2 > > +VER = 2.7.4 > > > > THISAPP = nut-$(VER) > > DL_FILE = $(THISAPP).tar.gz > > -DL_FROM = $(URL_IPFIRE) > > +DL_FROM = http://www.networkupstools.org/source/2.7 > > DIR_APP = $(DIR_SRC)/$(THISAPP) > > TARGET = $(DIR_INFO)/$(THISAPP) > > PROG = nut > > -PAK_VER = 5 > > +PAK_VER = 6 > > > > DEPS = "" > > > > @@ -44,7 +44,7 @@ objects = $(DL_FILE) > > > > $(DL_FILE) = $(DL_FROM)/$(DL_FILE) > > > > -$(DL_FILE)_MD5 = c3568b42e058cfc385b46d25140dced4 > > +$(DL_FILE)_MD5 = 3ba53656933d7471f95140b32a5b8d5c > > > > install : $(TARGET) > > > > @@ -83,7 +83,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) > > cd $(DIR_APP) && make > > cd $(DIR_APP) && make install > > # sed -i -e "s|ATTR{|SYSFS{|g" /etc/udev/rules.d/52-nut- > > usbups.rules > > - -mkdir -p /var/state/ups > > + mkdir -p /var/state/ups > > > > #install initscripts > > $(call INSTALL_INITSCRIPT,nut) Hmmmm. The md5sum of https://source.ipfire.org/source-2.x/nut-2.7.4.tar.gz isn't the same as that from http://www.networkupstools.org/source/2.7/nut-2.7.4.tar.gz . Thus, "NEXT" build fails. Please advise. Paul
Hello, I redownloaded the file from the official server and it should match now. I have no idea why those two files differed. They shouldn't. Best, -Michael On Thu, 2018-02-08 at 08:08 -0600, Paul Simmons wrote: > On Tue, 2018-02-06 at 00:37 +0000, Michael Tremer wrote: > > Hey, > > > > thanks for submitting this. > > > > I changed the URL back to our download server so that we will be able > > to > > download the source at any time, but apart from this, this is find > > with me. > > > > Merged. > > > > Best, > > -Michael > > > > On Fri, 2018-02-02 at 15:46 -0600, Paul T. Simmons wrote: > > > --- > > > config/rootfiles/packages/nut | 2 +- > > > lfs/nut | 10 +++++----- > > > 2 files changed, 6 insertions(+), 6 deletions(-) > > > > > > diff --git a/config/rootfiles/packages/nut > > > b/config/rootfiles/packages/nut > > > index 4e6167e0d..b01381d74 100644 > > > --- a/config/rootfiles/packages/nut > > > +++ b/config/rootfiles/packages/nut > > > @@ -5,7 +5,7 @@ etc/nut/upsd.conf.sample > > > etc/nut/upsd.users.sample > > > etc/nut/upsmon.conf.sample > > > etc/nut/upssched.conf.sample > > > -etc/udev/rules.d/52-nut-usbups.rules > > > +etc/udev/rules.d/62-nut-usbups.rules > > > usr/bin/al175 > > > usr/bin/apcsmart > > > usr/bin/apcsmart-old > > > diff --git a/lfs/nut b/lfs/nut > > > index 2045dce6c..c2cb6e973 100644 > > > --- a/lfs/nut > > > +++ b/lfs/nut > > > @@ -24,15 +24,15 @@ > > > > > > include Config > > > > > > -VER = 2.7.2 > > > +VER = 2.7.4 > > > > > > THISAPP = nut-$(VER) > > > DL_FILE = $(THISAPP).tar.gz > > > -DL_FROM = $(URL_IPFIRE) > > > +DL_FROM = http://www.networkupstools.org/source/2.7 > > > DIR_APP = $(DIR_SRC)/$(THISAPP) > > > TARGET = $(DIR_INFO)/$(THISAPP) > > > PROG = nut > > > -PAK_VER = 5 > > > +PAK_VER = 6 > > > > > > DEPS = "" > > > > > > @@ -44,7 +44,7 @@ objects = $(DL_FILE) > > > > > > $(DL_FILE) = $(DL_FROM)/$(DL_FILE) > > > > > > -$(DL_FILE)_MD5 = c3568b42e058cfc385b46d25140dced4 > > > +$(DL_FILE)_MD5 = 3ba53656933d7471f95140b32a5b8d5c > > > > > > install : $(TARGET) > > > > > > @@ -83,7 +83,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) > > > cd $(DIR_APP) && make > > > cd $(DIR_APP) && make install > > > # sed -i -e "s|ATTR{|SYSFS{|g" /etc/udev/rules.d/52-nut- > > > usbups.rules > > > - -mkdir -p /var/state/ups > > > + mkdir -p /var/state/ups > > > > > > #install initscripts > > > $(call INSTALL_INITSCRIPT,nut) > > Hmmmm. The md5sum of > https://source.ipfire.org/source-2.x/nut-2.7.4.tar.gz > isn't the same as that from > http://www.networkupstools.org/source/2.7/nut-2.7.4.tar.gz . > > Thus, "NEXT" build fails. > > Please advise. > > Paul
diff --git a/config/rootfiles/packages/nut b/config/rootfiles/packages/nut index 4e6167e0d..b01381d74 100644 --- a/config/rootfiles/packages/nut +++ b/config/rootfiles/packages/nut @@ -5,7 +5,7 @@ etc/nut/upsd.conf.sample etc/nut/upsd.users.sample etc/nut/upsmon.conf.sample etc/nut/upssched.conf.sample -etc/udev/rules.d/52-nut-usbups.rules +etc/udev/rules.d/62-nut-usbups.rules usr/bin/al175 usr/bin/apcsmart usr/bin/apcsmart-old diff --git a/lfs/nut b/lfs/nut index 2045dce6c..c2cb6e973 100644 --- a/lfs/nut +++ b/lfs/nut @@ -24,15 +24,15 @@ include Config -VER = 2.7.2 +VER = 2.7.4 THISAPP = nut-$(VER) DL_FILE = $(THISAPP).tar.gz -DL_FROM = $(URL_IPFIRE) +DL_FROM = http://www.networkupstools.org/source/2.7 DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = nut -PAK_VER = 5 +PAK_VER = 6 DEPS = "" @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = c3568b42e058cfc385b46d25140dced4 +$(DL_FILE)_MD5 = 3ba53656933d7471f95140b32a5b8d5c install : $(TARGET) @@ -83,7 +83,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && make cd $(DIR_APP) && make install # sed -i -e "s|ATTR{|SYSFS{|g" /etc/udev/rules.d/52-nut-usbups.rules - -mkdir -p /var/state/ups + mkdir -p /var/state/ups #install initscripts $(call INSTALL_INITSCRIPT,nut)