Re: [PATCH] Update: nut to 2.7.4

[Michael Tremer <michael.tremer@ipfire.org>]

[-- Attachment #1: Type: text/plain, Size: 2758 bytes --]

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

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]