Control: tags 687904 + patch Control: tags 687904 + pending Control: tags 821994 + pending Control: tags 834550 + pending
Dear maintainer, I've prepared an NMU for interchange (versioned as 5.7.7-2.1) and uploaded it to DELAYED/5. Please feel free to tell me if I should delay it longer. Regards. -- .''`. Homepage https://info.comodo.priv.at/ - OpenPGP key 0xBB3A68018649AA06 : :' : Debian GNU/Linux user, admin, and developer - https://www.debian.org/ `. `' Member of VIBE!AT & SPI, fellow of the Free Software Foundation Europe `- NP: Die Quote: You see
diff -u interchange-5.7.7/debian/changelog interchange-5.7.7/debian/changelog
--- interchange-5.7.7/debian/changelog
+++ interchange-5.7.7/debian/changelog
@@ -1,3 +1,22 @@
+interchange (5.7.7-2.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix "FTBFS with '.' removed from perl's @INC":
+ patch relocate.pl to "require './scripts/"
+ Thanks Dominic Hargreaves for the patch.
+ (Closes: #834550)
+ * Additionally add "-I." to a perl call in debian/rules, otherwise the build
+ fails later for the same reason.
+ * Fix "Build arch:all+arch:any but is missing build-{arch,indep}
+ targets": add build-arch and build-indep targets to debian/rules.
+ Patch from Santiago Vila, thanks.
+ (Closes: #821994)
+ * (Re?)apply the patch from #625904 to replace Digest::SHA1 with
+ Digest::SHA.
+ (Closes: #687904)
+
+ -- gregor herrmann <[email protected]> Wed, 31 Aug 2016 22:47:29 +0200
+
interchange (5.7.7-2) unstable; urgency=low
* Remove superfluous space before question mark from Debconf template
diff -u interchange-5.7.7/debian/rules interchange-5.7.7/debian/rules
--- interchange-5.7.7/debian/rules
+++ interchange-5.7.7/debian/rules
@@ -28,6 +28,8 @@
IC_VERSION := $(shell dpkg-parsechangelog | perl -ne 'print $$1 if /^Version: (.*?)-(.*)$$/')
IC_MAJOR_VERSION := $(shell dpkg-parsechangelog | perl -ne 'print $$1 if /^Version: (\d+\.\d+)(.*?)-(.*)$$/')
+build-arch: build
+build-indep: build
build: build-stamp
build-stamp:
dh_testdir
@@ -87,7 +89,7 @@
dist/robots.cfg dist/subdomains.cfg $(TMP)/etc/interchange
# build Interchange control program(s)
mkdir -p $(TMP)/usr/lib/cgi-bin/ic
- $(PERL) scripts/compile_link \
+ $(PERL) -I. scripts/compile_link \
--nostrip \
--socket=/var/run/interchange/interchange.sock \
--port=7786 \
@@ -173 +175 @@
-.PHONY: build clean binary-indep binary-arch binary install
+.PHONY: build build-arch build-indep clean binary-indep binary-arch binary install
only in patch2:
unchanged:
--- interchange-5.7.7.orig/code/Filter/sha1.filter
+++ interchange-5.7.7/code/Filter/sha1.filter
@@ -5,15 +5,15 @@
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version. See the LICENSE file for details.
-Require module Digest::SHA1
+Require module Digest::SHA
CodeDef sha1 Filter
CodeDef sha1 Description sha1 sum
CodeDef sha1 Routine <<EOR
-use Digest::SHA1;
+use Digest::SHA;
sub {
- return Digest::SHA1::sha1_hex($_[0]);
+ return Digest::SHA::sha1_hex($_[0]);
}
EOR
only in patch2:
unchanged:
--- interchange-5.7.7.orig/lib/Vend/UserDB.pm
+++ interchange-5.7.7/lib/Vend/UserDB.pm
@@ -34,16 +34,16 @@
my $ready = new Vend::Safe;
-my $HAVE_SHA1;
+my $HAVE_SHA;
eval {
- require Digest::SHA1;
- import Digest::SHA1;
- $HAVE_SHA1 = 1;
+ require Digest::SHA;
+ import Digest::SHA;
+ $HAVE_SHA = 1;
};
if ($@) {
- ::logGlobal("SHA1 passwords disabled: $@");
+ ::logGlobal("SHA passwords disabled: $@");
}
# The object encryption methods take three arguments: object, password, and
@@ -100,11 +100,11 @@
sub enc_sha1 {
my $obj = shift;
- unless ($HAVE_SHA1) {
- $obj->log_either('SHA1 passwords unavailable. Is Digest::SHA1 installed?');
+ unless ($HAVE_SHA) {
+ $obj->log_either('SHA passwords unavailable. Is Digest::SHA installed?');
return;
}
- return Digest::SHA1::sha1_hex(shift);
+ return Digest::SHA::sha1_hex(shift);
}
# Maps the length of the encrypted data to the algorithm that
only in patch2:
unchanged:
--- interchange-5.7.7.orig/relocate.pl
+++ interchange-5.7.7/relocate.pl
@@ -23,7 +23,7 @@
use Config;
-require 'scripts/initp.pl';
+require './scripts/initp.pl';
sub doit {
my ($key) = @_;
signature.asc
Description: Digital Signature
