From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Tremer To: development@lists.ipfire.org Subject: Re: [PATCH] Update: nut to 2.7.4 Date: Fri, 09 Feb 2018 13:06:51 +0000 Message-ID: <1518181611.7434.44.camel@ipfire.org> In-Reply-To: <1518098917.28985.24.camel@gmail.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============7668994284378984579==" List-Id: --===============7668994284378984579== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit 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 --===============7668994284378984579== Content-Type: application/pgp-signature Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="signature.asc" MIME-Version: 1.0 LS0tLS1CRUdJTiBQR1AgU0lHTkFUVVJFLS0tLS0KCmlRSXpCQUFCQ2dBZEZpRUU1L3JXNWwzR0dl Mnlwa3R4Z0hudy8yK1FDUWNGQWxwOW5Pc0FDZ2tRZ0hudy8yK1EKQ1FjNml3LzdCSFE5akIvZUhv QUR3VWJIVVZGVGswSUdYRk1xUHBZam45RDQ4bGdsWFZhbWd6Zk82dmVnZFZFRQpYN0RZV3Z5ZW9V QWVrcUJEY20zbGRIbVFKL3IwYmVKSUIvRzhwWk94NjZyaWk2T1N6TElJL3dlRWxOUWQ3QVpBCnNz L1E4SkpqQnArcDA3NUFjUzFaWUVGaEJTRlE3OGozU3FVNVVYejVGUnNQUjU2aTZvNUNQbWhsNWNp d0hJZjYKQ0R2dm5FeE5MT0t0MVVJcHBuOURUUEx6czlxNmorcSs1YUMxWE5OUG9TVDFLZkk5RkRl bm9PejJKTDhwQlIxUQpvU2psaTBsNG5qM01HV1FQcE5JU0tPZ1pSTll6b2hMbFJBWEQwc3ZCNEQ4 cmRmc0VpdGdxSDU4bDZITlFrb0tmCnBER2MwV0ZJUHJqbFJKNEVMSWIvOURFWW5IRGt0YlZjTFBF cnR5cjRJQmU0SGh5aHRvSVhrMDRGaThGdVU0bEQKdWpZSVllQXZzcTAwR3czSnJORzlEbGJKamZo Rm44RldnMHF1QVpqK0NlMGM2K1paNHRQUGl1djQvczZmS1pQZwp5T2R4OS9xa3BDZkhXd3BYV2NX OXlNTWh6VUYyOVV1T2ZWODRLYU1pNnRZU0VqT3BUNFNrMHVkdW5raGh5M0xWClJENDljL2wxeThK MzlDYUFGVlpiNUxZanhUang1dGZCVkVtTXQ4MXNGL0ZrNFBNL3BsSjFSZHYwM1FHZTNRWmgKS2ht QTlmUUI4b2tDNTZmWWg1a2UrV2FlbHVjam9xWjdjOHROL0wvVFQyTTVRMGtTRWhmYmRvY2sxRFZQ QzhOVwpPUlZPd1U3cnNhaktvWHlRMGdyTDFhZkhHOWNFWHhkYk12Z2dYZEZhS2pldyswclhDRDA9 Cj1vYzZJCi0tLS0tRU5EIFBHUCBTSUdOQVRVUkUtLS0tLQo= --===============7668994284378984579==--